Skip to content

Commit f161819

Browse files
Update RavenDB to 6.2.3 (#4765)
* Update RavenDB to 6.2.3 * Amend self-contained Raven test as result of Raven installer layout change * Update tools/download-ravendb-server.ps1 Co-authored-by: Daniel Marbach <[email protected]> --------- Co-authored-by: Daniel Marbach <[email protected]>
1 parent cd1ee31 commit f161819

File tree

2 files changed

+23
-8
lines changed

2 files changed

+23
-8
lines changed

src/Directory.Packages.props

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@
5757
<PackageVersion Include="PropertyChanged.Fody" Version="4.1.0" />
5858
<PackageVersion Include="PropertyChanging.Fody" Version="1.30.3" />
5959
<PackageVersion Include="PublicApiGenerator" Version="11.4.1" />
60-
<PackageVersion Include="RavenDB.Embedded" Version="6.2.0" />
60+
<PackageVersion Include="RavenDB.Embedded" Version="6.2.3" />
6161
<PackageVersion Include="ReactiveUI.WPF" Version="20.1.63" />
6262
<PackageVersion Include="ServiceControl.Contracts" Version="5.0.0" />
6363
<PackageVersion Include="System.Configuration.ConfigurationManager" Version="8.0.1" />

src/ServiceControlInstaller.Engine.UnitTests/Validation/SelfContainedRavenDBTest.cs

Lines changed: 22 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -11,21 +11,36 @@ class SelfContainedRavenDBTest
1111
public void CheckForSelfContainedRavenDB()
1212
{
1313
bool isCI = Environment.GetEnvironmentVariable("CI") == "true";
14-
bool isLocal = !isCI;
1514

1615
var ravenServerPath = Path.GetFullPath(Path.Combine(TestContext.CurrentContext.TestDirectory, "..", "..", "..", "..", "..", "deploy", "RavenDBServer"));
1716
var ravenStudio = Path.Combine(ravenServerPath, "Raven.Studio.zip");
1817
var ravenServerDll = Path.Combine(ravenServerPath, "Raven.Server.dll");
1918
var ravenServerExe = Path.Combine(ravenServerPath, "Raven.Server.exe");
2019
var offlineOperationsUtility = Path.Combine(ravenServerPath, "rvn.exe");
2120

22-
Assert.Multiple(() =>
21+
try
2322
{
24-
Assert.That(ravenStudio, Does.Exist); // No matter what
25-
Assert.That(File.Exists(ravenServerDll), Is.EqualTo(isLocal)); // Only in local development
26-
Assert.That(File.Exists(ravenServerExe), Is.EqualTo(isCI)); // Only on CI
27-
Assert.That(File.Exists(offlineOperationsUtility), Is.EqualTo(isCI)); // Only on CI
28-
});
23+
Assert.Multiple(() =>
24+
{
25+
Assert.That(ravenStudio, Does.Exist); // As of 6.2.3 this exists in embedded & self-contained versions
26+
Assert.That(ravenServerDll, Does.Exist); // As of 6.2.3 this exists in embedded & self-contained versions
27+
if (isCI)
28+
{
29+
// These may not exist on a local build and that's OK, but they must exist in a self-contained build
30+
Assert.That(ravenServerExe, Does.Exist);
31+
Assert.That(offlineOperationsUtility, Does.Exist);
32+
}
33+
});
34+
}
35+
catch (Exception)
36+
{
37+
TestContext.Out.WriteLine($"Contents of RavenServerPath {ravenServerPath}:");
38+
foreach (var name in Directory.GetFileSystemEntries(ravenServerPath))
39+
{
40+
TestContext.Out.WriteLine($" * {name}");
41+
}
42+
throw;
43+
}
2944
}
3045
}
3146
}

0 commit comments

Comments
 (0)