Mirrors/velopack
1
0
Fork 0
mirror of https://github.com/velopack/velopack.git synced 2025-10-25 15:19:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

Rename classes to get rid of naming conflict

Browse Source
This commit is contained in:
Paul Betts
2014-08-08 13:01:25 +02:00
parent 0763761c57
commit cedb12266d
6 changed files with 12 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
Squirrel.sln
View File

@@ -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.ActiveCfg = Release|Any CPU
{98AEB048-E27D-42F4-9440-505B7F78BAFD}.Release|Any CPU.Build.0 = 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.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.ActiveCfg = Debug|Win32
{C1D40624-A484-438A-B846-052F321C89D1}.Debug|Any CPU.Build.0 = 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 {C1D40624-A484-438A-B846-052F321C89D1}.Release|Any CPU.ActiveCfg = Release|Win32

2
src/Squirrel/IUpdateManager.cs
View File

@@ -48,7 +48,7 @@ namespace Squirrel
/// Completely uninstalls the targeted app /// Completely uninstalls the targeted app
/// </summary> /// </summary>
/// <returns>Completion</returns> /// <returns>Completion</returns>
async Task FullUninstall(); Task FullUninstall();
} }
public static class EasyModeMixin public static class EasyModeMixin

9
src/Squirrel/UpdateManager.ApplyReleases.cs
View File

@@ -13,14 +13,14 @@ namespace Squirrel
{ {
public sealed partial class UpdateManager public sealed partial class UpdateManager
{ {
class ApplyReleases : IEnableLogger class ApplyReleasesImpl : IEnableLogger
{ {
// TODO: Kill this entire concept // TODO: Kill this entire concept
readonly FrameworkVersion appFrameworkVersion = FrameworkVersion.Net45; readonly FrameworkVersion appFrameworkVersion = FrameworkVersion.Net45;
readonly string rootAppDirectory; readonly string rootAppDirectory;
public ApplyReleases(string rootAppDirectory) public ApplyReleasesImpl(string rootAppDirectory)
{ {
this.rootAppDirectory = rootAppDirectory; this.rootAppDirectory = rootAppDirectory;
} }
@@ -331,11 +331,6 @@ namespace Squirrel
.ToArray(); .ToArray();
} }
static string getLocalAppDataDirectory()
{
return Environment.GetFolderPath(Environment.SpecialFolder.LocalApplicationData);
}
DirectoryInfo getDirectoryForRelease(Version releaseVersion) DirectoryInfo getDirectoryForRelease(Version releaseVersion)
{ {
return new DirectoryInfo(Path.Combine(rootAppDirectory, "app-" + releaseVersion)); return new DirectoryInfo(Path.Combine(rootAppDirectory, "app-" + releaseVersion));

4
src/Squirrel/UpdateManager.CheckForUpdates.cs
View File

@@ -11,14 +11,14 @@ namespace Squirrel
{ {
public sealed partial class UpdateManager public sealed partial class UpdateManager
{ {
class CheckForUpdates : IEnableLogger class CheckForUpdateImpl : IEnableLogger
{ {
readonly string rootAppDirectory; readonly string rootAppDirectory;
// TODO: rip this out // TODO: rip this out
readonly FrameworkVersion appFrameworkVersion = FrameworkVersion.Net45; readonly FrameworkVersion appFrameworkVersion = FrameworkVersion.Net45;
public CheckForUpdates(string rootAppDirectory) public CheckForUpdateImpl(string rootAppDirectory)
{ {
this.rootAppDirectory = rootAppDirectory; this.rootAppDirectory = rootAppDirectory;
} }

4
src/Squirrel/UpdateManager.DownloadReleases.cs
View File

@@ -10,11 +10,11 @@ namespace Squirrel
{ {
public sealed partial class UpdateManager public sealed partial class UpdateManager
{ {
class DownloadReleases : IEnableLogger class DownloadReleasesImpl : IEnableLogger
{ {
readonly string rootAppDirectory; readonly string rootAppDirectory;
public DownloadReleases(string rootAppDirectory) public DownloadReleasesImpl(string rootAppDirectory)
{ {
this.rootAppDirectory = rootAppDirectory; this.rootAppDirectory = rootAppDirectory;
} }

8
src/Squirrel/UpdateManager.cs
View File

@@ -43,7 +43,7 @@ namespace Squirrel
public async Task<UpdateInfo> CheckForUpdate(bool ignoreDeltaUpdates, Action<int> progress = null) public async Task<UpdateInfo> CheckForUpdate(bool ignoreDeltaUpdates, Action<int> progress = null)
{ {
var checkForUpdate = new CheckForUpdates(rootAppDirectory); var checkForUpdate = new CheckForUpdateImpl(rootAppDirectory);
await acquireUpdateLock(); await acquireUpdateLock();
return await checkForUpdate.CheckForUpdate(Utility.LocalReleaseFileForAppDir(rootAppDirectory), updateUrlOrPath, ignoreDeltaUpdates, progress, urlDownloader); return await checkForUpdate.CheckForUpdate(Utility.LocalReleaseFileForAppDir(rootAppDirectory), updateUrlOrPath, ignoreDeltaUpdates, progress, urlDownloader);
@@ -51,7 +51,7 @@ namespace Squirrel
public async Task DownloadReleases(IEnumerable<ReleaseEntry> releasesToDownload, Action<int> progress = null) public async Task DownloadReleases(IEnumerable<ReleaseEntry> releasesToDownload, Action<int> progress = null)
{ {
var downloadReleases = new DownloadReleases(rootAppDirectory); var downloadReleases = new DownloadReleasesImpl(rootAppDirectory);
await acquireUpdateLock(); await acquireUpdateLock();
await downloadReleases.DownloadReleases(updateUrlOrPath, releasesToDownload, progress, urlDownloader); await downloadReleases.DownloadReleases(updateUrlOrPath, releasesToDownload, progress, urlDownloader);
@@ -59,7 +59,7 @@ namespace Squirrel
public async Task ApplyReleases(UpdateInfo updateInfo, Action<int> progress = null) public async Task ApplyReleases(UpdateInfo updateInfo, Action<int> progress = null)
{ {
var applyReleases = new ApplyReleases(rootAppDirectory); var applyReleases = new ApplyReleasesImpl(rootAppDirectory);
await acquireUpdateLock(); await acquireUpdateLock();
await applyReleases.ApplyReleases(updateInfo, progress); await applyReleases.ApplyReleases(updateInfo, progress);
@@ -67,7 +67,7 @@ namespace Squirrel
public async Task FullUninstall() public async Task FullUninstall()
{ {
var applyReleases = new ApplyReleases(rootAppDirectory); var applyReleases = new ApplyReleasesImpl(rootAppDirectory);
await acquireUpdateLock(); await acquireUpdateLock();
await applyReleases.FullUninstall(); await applyReleases.FullUninstall();