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

bug fix

Browse Source
This commit is contained in:
Caelan Sayler
2023-12-21 14:48:35 +00:00
parent d87a13ea0b
commit 4bd08e14b5
3 changed files with 22 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/Squirrel/Locators/TestSquirrelLocator.cs
View File

@@ -31,17 +31,18 @@ namespace Squirrel.Locators
public override string UpdateExePath => throw new NotSupportedException("TestSquirrelLocator does not support this operation.");
/// <inheritdoc />
public override SemanticVersion CurrentlyInstalledVersion => new SemanticVersion(0, 0, 0);
public override SemanticVersion CurrentlyInstalledVersion { get; }
/// <inheritdoc />
public override string AppContentDir => AppContext.BaseDirectory;
/// <inheritdoc cref="TestSquirrelLocator" />
public TestSquirrelLocator(string appId, string packagesDir, ILogger logger)
public TestSquirrelLocator(string appId, string version, string packagesDir, ILogger logger)
: base(logger)
{
AppId = appId;
PackagesDir = packagesDir;
CurrentlyInstalledVersion = SemanticVersion.Parse(version);
}
}
}

2
src/Squirrel/Sources/SimpleFileSource.cs
View File

@@ -29,7 +29,7 @@ namespace Squirrel.Sources
if (!BaseDirectory.Exists)
throw new Exception($"The local update directory '{BaseDirectory.FullName}' does not exist.");
var releasesPath = Path.Combine(BaseDirectory.FullName, "RELEASES");
var releasesPath = Path.Combine(BaseDirectory.FullName, GetReleasesFileName());
Log.Info($"Reading RELEASES from '{releasesPath}'");
var fi = new FileInfo(releasesPath);

36
test/Squirrel.Tests/TestHelpers/IntegrationTestHelper.cs
View File

@@ -36,26 +36,26 @@ namespace Squirrel.Tests.TestHelpers
return (osVersion < 601);
}
public static void RunBlockAsSTA(Action block)
{
Exception ex = null;
var t = new Thread(() => {
try {
block();
} catch (Exception e) {
ex = e;
}
});
//public static void RunBlockAsSTA(Action block)
//{
// Exception ex = null;
// var t = new Thread(() => {
// try {
// block();
// } catch (Exception e) {
// ex = e;
// }
// });
t.SetApartmentState(ApartmentState.STA);
t.Start();
t.Join();
// t.SetApartmentState(ApartmentState.STA);
// t.Start();
// t.Join();
if (ex != null) {
// NB: If we don't do this, the test silently passes
throw new Exception("", ex);
}
}
// if (ex != null) {
// // NB: If we don't do this, the test silently passes
// throw new Exception("", ex);
// }
//}
public static IDisposable WithFakeInstallDirectory(string packageFileName, out string path)
{