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

RootDir != RootAppDir

Browse Source
This commit is contained in:
Paul Betts
2014-08-08 13:51:02 +02:00
parent 41cfc64e9d
commit 2b72912ef2
2 changed files with 32 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
test/ApplyReleasesTests.cs
View File

@@ -33,8 +33,8 @@ namespace Squirrel.Tests
{ {
string tempDir; string tempDir;
using (Utility.WithTempDirectory(out tempDir)) { using (Utility.WithTempDirectory(out tempDir)) {
Directory.CreateDirectory(Path.Combine(tempDir, "theApp")); var appDir = Directory.CreateDirectory(Path.Combine(tempDir, "theApp"));
var packages = Path.Combine(tempDir, "theApp", "packages"); var packages = Path.Combine(appDir.FullName, "packages");
Directory.CreateDirectory(packages); Directory.CreateDirectory(packages);
var package = "Squirrel.Core.1.0.0.0-full.nupkg"; var package = "Squirrel.Core.1.0.0.0-full.nupkg";
@@ -55,8 +55,8 @@ namespace Squirrel.Tests
string tempDir; string tempDir;
using (Utility.WithTempDirectory(out tempDir)) using (Utility.WithTempDirectory(out tempDir))
{ {
Directory.CreateDirectory(Path.Combine(tempDir, "theApp")); var appDir = Directory.CreateDirectory(Path.Combine(tempDir, "theApp"));
var packages = Path.Combine(tempDir, "theApp", "packages"); var packages = Path.Combine(appDir.FullName, "packages");
Directory.CreateDirectory(packages); Directory.CreateDirectory(packages);
var baseFile = "Squirrel.Core.1.0.0.0-full.nupkg"; var baseFile = "Squirrel.Core.1.0.0.0-full.nupkg";
@@ -82,7 +82,8 @@ namespace Squirrel.Tests
string tempDir; string tempDir;
using (Utility.WithTempDirectory(out tempDir)) { using (Utility.WithTempDirectory(out tempDir)) {
string packagesDir = Path.Combine(tempDir, "theApp", "packages"); string appDir = Path.Combine(tempDir, "theApp");
string packagesDir = Path.Combine(appDir, "packages");
Directory.CreateDirectory(packagesDir); Directory.CreateDirectory(packagesDir);
new[] { new[] {
@@ -90,7 +91,7 @@ namespace Squirrel.Tests
"Squirrel.Core.1.1.0.0-full.nupkg", "Squirrel.Core.1.1.0.0-full.nupkg",
}.ForEach(x => File.Copy(IntegrationTestHelper.GetPath("fixtures", x), Path.Combine(packagesDir, x))); }.ForEach(x => File.Copy(IntegrationTestHelper.GetPath("fixtures", x), Path.Combine(packagesDir, x)));
var fixture = new UpdateManager.ApplyReleasesImpl(tempDir); var fixture = new UpdateManager.ApplyReleasesImpl(appDir);
var baseEntry = ReleaseEntry.GenerateFromFile(Path.Combine(packagesDir, "Squirrel.Core.1.0.0.0-full.nupkg")); var baseEntry = ReleaseEntry.GenerateFromFile(Path.Combine(packagesDir, "Squirrel.Core.1.0.0.0-full.nupkg"));
var latestFullEntry = ReleaseEntry.GenerateFromFile(Path.Combine(packagesDir, "Squirrel.Core.1.1.0.0-full.nupkg")); var latestFullEntry = ReleaseEntry.GenerateFromFile(Path.Combine(packagesDir, "Squirrel.Core.1.1.0.0-full.nupkg"));
@@ -131,7 +132,8 @@ namespace Squirrel.Tests
string tempDir; string tempDir;
using (Utility.WithTempDirectory(out tempDir)) { using (Utility.WithTempDirectory(out tempDir)) {
string packagesDir = Path.Combine(tempDir, "theApp", "packages"); string appDir = Path.Combine(tempDir, "theApp");
string packagesDir = Path.Combine(appDir, "packages");
Directory.CreateDirectory(packagesDir); Directory.CreateDirectory(packagesDir);
new[] { new[] {
@@ -139,7 +141,7 @@ namespace Squirrel.Tests
"Squirrel.Core.1.2.0.0-full.nupkg", "Squirrel.Core.1.2.0.0-full.nupkg",
}.ForEach(x => File.Copy(IntegrationTestHelper.GetPath("fixtures", x), Path.Combine(packagesDir, x))); }.ForEach(x => File.Copy(IntegrationTestHelper.GetPath("fixtures", x), Path.Combine(packagesDir, x)));
var fixture = new UpdateManager.ApplyReleasesImpl(tempDir); var fixture = new UpdateManager.ApplyReleasesImpl(appDir);
var baseEntry = ReleaseEntry.GenerateFromFile(Path.Combine(packagesDir, "Squirrel.Core.1.1.0.0-full.nupkg")); var baseEntry = ReleaseEntry.GenerateFromFile(Path.Combine(packagesDir, "Squirrel.Core.1.1.0.0-full.nupkg"));
var latestFullEntry = ReleaseEntry.GenerateFromFile(Path.Combine(packagesDir, "Squirrel.Core.1.2.0.0-full.nupkg")); var latestFullEntry = ReleaseEntry.GenerateFromFile(Path.Combine(packagesDir, "Squirrel.Core.1.2.0.0-full.nupkg"));
@@ -179,7 +181,8 @@ namespace Squirrel.Tests
using (Utility.WithTempDirectory(out tempDir)) using (Utility.WithTempDirectory(out tempDir))
{ {
string packagesDir = Path.Combine(tempDir, "theApp", "packages"); string appDir = Path.Combine(tempDir, "theApp");
string packagesDir = Path.Combine(appDir, "packages");
Directory.CreateDirectory(packagesDir); Directory.CreateDirectory(packagesDir);
new[] { new[] {
@@ -187,7 +190,7 @@ namespace Squirrel.Tests
"Squirrel.Core.1.3.0.0-full.nupkg", "Squirrel.Core.1.3.0.0-full.nupkg",
}.ForEach(x => File.Copy(IntegrationTestHelper.GetPath("fixtures", x), Path.Combine(packagesDir, x))); }.ForEach(x => File.Copy(IntegrationTestHelper.GetPath("fixtures", x), Path.Combine(packagesDir, x)));
var fixture = new UpdateManager.ApplyReleasesImpl(tempDir); var fixture = new UpdateManager.ApplyReleasesImpl(appDir);
var baseEntry = ReleaseEntry.GenerateFromFile(Path.Combine(packagesDir, "Squirrel.Core.1.1.0.0-full.nupkg")); var baseEntry = ReleaseEntry.GenerateFromFile(Path.Combine(packagesDir, "Squirrel.Core.1.1.0.0-full.nupkg"));
var latestFullEntry = ReleaseEntry.GenerateFromFile(Path.Combine(packagesDir, "Squirrel.Core.1.3.0.0-full.nupkg")); var latestFullEntry = ReleaseEntry.GenerateFromFile(Path.Combine(packagesDir, "Squirrel.Core.1.3.0.0-full.nupkg"));
@@ -228,7 +231,8 @@ namespace Squirrel.Tests
string tempDir; string tempDir;
using (Utility.WithTempDirectory(out tempDir)) { using (Utility.WithTempDirectory(out tempDir)) {
string packagesDir = Path.Combine(tempDir, "theApp", "packages"); string appDir = Path.Combine(tempDir, "theApp");
string packagesDir = Path.Combine(appDir, "packages");
Directory.CreateDirectory(packagesDir); Directory.CreateDirectory(packagesDir);
new[] { new[] {
@@ -237,7 +241,7 @@ namespace Squirrel.Tests
"Squirrel.Core.1.1.0.0-full.nupkg", "Squirrel.Core.1.1.0.0-full.nupkg",
}.ForEach(x => File.Copy(IntegrationTestHelper.GetPath("fixtures", x), Path.Combine(packagesDir, x))); }.ForEach(x => File.Copy(IntegrationTestHelper.GetPath("fixtures", x), Path.Combine(packagesDir, x)));
var fixture = new UpdateManager.ApplyReleasesImpl(tempDir); var fixture = new UpdateManager.ApplyReleasesImpl(appDir);
var baseEntry = ReleaseEntry.GenerateFromFile(Path.Combine(packagesDir, "Squirrel.Core.1.0.0.0-full.nupkg")); var baseEntry = ReleaseEntry.GenerateFromFile(Path.Combine(packagesDir, "Squirrel.Core.1.0.0.0-full.nupkg"));
var deltaEntry = ReleaseEntry.GenerateFromFile(Path.Combine(packagesDir, "Squirrel.Core.1.1.0.0-delta.nupkg")); var deltaEntry = ReleaseEntry.GenerateFromFile(Path.Combine(packagesDir, "Squirrel.Core.1.1.0.0-delta.nupkg"));
@@ -278,7 +282,9 @@ namespace Squirrel.Tests
{ {
string tempDir; string tempDir;
using (Utility.WithTempDirectory(out tempDir)) { using (Utility.WithTempDirectory(out tempDir)) {
Directory.CreateDirectory(Path.Combine(tempDir, "theApp", "packages")); string appDir = Path.Combine(tempDir, "theApp");
string packagesDir = Path.Combine(appDir, "packages");
Directory.CreateDirectory(packagesDir);
new[] { new[] {
"Squirrel.Core.1.0.0.0-full.nupkg", "Squirrel.Core.1.0.0.0-full.nupkg",
@@ -286,7 +292,7 @@ namespace Squirrel.Tests
}.ForEach(x => File.Copy(IntegrationTestHelper.GetPath("fixtures", x), Path.Combine(tempDir, "theApp", "packages", x))); }.ForEach(x => File.Copy(IntegrationTestHelper.GetPath("fixtures", x), Path.Combine(tempDir, "theApp", "packages", x)));
var urlDownloader = new FakeUrlDownloader(); var urlDownloader = new FakeUrlDownloader();
var fixture = new UpdateManager.ApplyReleasesImpl(tempDir); var fixture = new UpdateManager.ApplyReleasesImpl(appDir);
var baseEntry = ReleaseEntry.GenerateFromFile(Path.Combine(tempDir, "theApp", "packages", "Squirrel.Core.1.0.0.0-full.nupkg")); var baseEntry = ReleaseEntry.GenerateFromFile(Path.Combine(tempDir, "theApp", "packages", "Squirrel.Core.1.0.0.0-full.nupkg"));
var deltaEntry = ReleaseEntry.GenerateFromFile(Path.Combine(tempDir, "theApp", "packages", "Squirrel.Core.1.1.0.0-delta.nupkg")); var deltaEntry = ReleaseEntry.GenerateFromFile(Path.Combine(tempDir, "theApp", "packages", "Squirrel.Core.1.1.0.0-delta.nupkg"));

20
test/UpdateManagerTests.cs
View File

@@ -19,7 +19,8 @@ namespace Squirrel.Tests
{ {
string tempDir; string tempDir;
using (Utility.WithTempDirectory(out tempDir)) { using (Utility.WithTempDirectory(out tempDir)) {
var packageDir = Directory.CreateDirectory(Path.Combine(tempDir, "theApp", "packages")); var appDir = Path.Combine(tempDir, "theApp");
var packageDir = Directory.CreateDirectory(Path.Combine(appDir, "packages"));
new[] { new[] {
"Squirrel.Core.1.0.0.0-full.nupkg", "Squirrel.Core.1.0.0.0-full.nupkg",
@@ -27,7 +28,7 @@ namespace Squirrel.Tests
"Squirrel.Core.1.1.0.0-full.nupkg", "Squirrel.Core.1.1.0.0-full.nupkg",
}.ForEach(x => File.Copy(IntegrationTestHelper.GetPath("fixtures", x), Path.Combine(tempDir, "theApp", "packages", x))); }.ForEach(x => File.Copy(IntegrationTestHelper.GetPath("fixtures", x), Path.Combine(tempDir, "theApp", "packages", x)));
var fixture = new UpdateManager.ApplyReleasesImpl(tempDir); var fixture = new UpdateManager.ApplyReleasesImpl(appDir);
await fixture.updateLocalReleasesFile(); await fixture.updateLocalReleasesFile();
@@ -45,7 +46,8 @@ namespace Squirrel.Tests
string tempDir; string tempDir;
using (Utility.WithTempDirectory(out tempDir)) using (Utility.WithTempDirectory(out tempDir))
{ {
var localPackages = Path.Combine(tempDir, "theApp", "packages"); var appDir = Path.Combine(tempDir, "theApp");
var localPackages = Path.Combine(appDir, "packages");
var remotePackages = Path.Combine(tempDir, "releases"); var remotePackages = Path.Combine(tempDir, "releases");
Directory.CreateDirectory(localPackages); Directory.CreateDirectory(localPackages);
Directory.CreateDirectory(remotePackages); Directory.CreateDirectory(remotePackages);
@@ -61,7 +63,7 @@ namespace Squirrel.Tests
File.Copy(path, Path.Combine(remotePackages, x)); File.Copy(path, Path.Combine(remotePackages, x));
}); });
var fixture = new UpdateManager.ApplyReleasesImpl(tempDir); var fixture = new UpdateManager.ApplyReleasesImpl(appDir);
// sync both release files // sync both release files
await fixture.updateLocalReleasesFile(); await fixture.updateLocalReleasesFile();
@@ -84,7 +86,8 @@ namespace Squirrel.Tests
string tempDir; string tempDir;
using (Utility.WithTempDirectory(out tempDir)) using (Utility.WithTempDirectory(out tempDir))
{ {
var localPackages = Path.Combine(tempDir, "theApp", "packages"); var appDir = Path.Combine(tempDir, "theApp");
var localPackages = Path.Combine(appDir, "packages");
var remotePackages = Path.Combine(tempDir, "releases"); var remotePackages = Path.Combine(tempDir, "releases");
Directory.CreateDirectory(localPackages); Directory.CreateDirectory(localPackages);
Directory.CreateDirectory(remotePackages); Directory.CreateDirectory(remotePackages);
@@ -108,7 +111,7 @@ namespace Squirrel.Tests
File.Copy(path, Path.Combine(remotePackages, x)); File.Copy(path, Path.Combine(remotePackages, x));
}); });
var fixture = new UpdateManager.ApplyReleasesImpl(tempDir); var fixture = new UpdateManager.ApplyReleasesImpl(appDir);
// sync both release files // sync both release files
await fixture.updateLocalReleasesFile(); await fixture.updateLocalReleasesFile();
@@ -130,7 +133,8 @@ namespace Squirrel.Tests
string tempDir; string tempDir;
using (Utility.WithTempDirectory(out tempDir)) using (Utility.WithTempDirectory(out tempDir))
{ {
var localPackages = Path.Combine(tempDir, "theApp", "packages"); var appDir = Path.Combine(tempDir, "theApp");
var localPackages = Path.Combine(appDir, "packages");
var remotePackages = Path.Combine(tempDir, "releases"); var remotePackages = Path.Combine(tempDir, "releases");
Directory.CreateDirectory(localPackages); Directory.CreateDirectory(localPackages);
Directory.CreateDirectory(remotePackages); Directory.CreateDirectory(remotePackages);
@@ -149,7 +153,7 @@ namespace Squirrel.Tests
File.Copy(path, Path.Combine(remotePackages, x)); File.Copy(path, Path.Combine(remotePackages, x));
}); });
var fixture = new UpdateManager.ApplyReleasesImpl(tempDir); var fixture = new UpdateManager.ApplyReleasesImpl(appDir);
// sync both release files // sync both release files
await fixture.updateLocalReleasesFile(); await fixture.updateLocalReleasesFile();