From f161819459fb1effc4c70a4878c44899a79b3e00 Mon Sep 17 00:00:00 2001
From: David Boike <david.boike@gmail.com>
Date: Fri, 31 Jan 2025 15:48:30 -0600
Subject: [PATCH] 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 <daniel.marbach@openplace.net>

---------

Co-authored-by: Daniel Marbach <daniel.marbach@openplace.net>
---
 src/Directory.Packages.props                  |  2 +-
 .../Validation/SelfContainedRavenDBTest.cs    | 29 ++++++++++++++-----
 2 files changed, 23 insertions(+), 8 deletions(-)

diff --git a/src/Directory.Packages.props b/src/Directory.Packages.props
index 9fff7c9586..9fb190553e 100644
--- a/src/Directory.Packages.props
+++ b/src/Directory.Packages.props
@@ -57,7 +57,7 @@
     <PackageVersion Include="PropertyChanged.Fody" Version="4.1.0" />
     <PackageVersion Include="PropertyChanging.Fody" Version="1.30.3" />
     <PackageVersion Include="PublicApiGenerator" Version="11.4.1" />
-    <PackageVersion Include="RavenDB.Embedded" Version="6.2.0" />
+    <PackageVersion Include="RavenDB.Embedded" Version="6.2.3" />
     <PackageVersion Include="ReactiveUI.WPF" Version="20.1.63" />
     <PackageVersion Include="ServiceControl.Contracts" Version="5.0.0" />
     <PackageVersion Include="System.Configuration.ConfigurationManager" Version="8.0.1" />
diff --git a/src/ServiceControlInstaller.Engine.UnitTests/Validation/SelfContainedRavenDBTest.cs b/src/ServiceControlInstaller.Engine.UnitTests/Validation/SelfContainedRavenDBTest.cs
index 9e1b1582be..e37d1f7c50 100644
--- a/src/ServiceControlInstaller.Engine.UnitTests/Validation/SelfContainedRavenDBTest.cs
+++ b/src/ServiceControlInstaller.Engine.UnitTests/Validation/SelfContainedRavenDBTest.cs
@@ -11,7 +11,6 @@ class SelfContainedRavenDBTest
         public void CheckForSelfContainedRavenDB()
         {
             bool isCI = Environment.GetEnvironmentVariable("CI") == "true";
-            bool isLocal = !isCI;
 
             var ravenServerPath = Path.GetFullPath(Path.Combine(TestContext.CurrentContext.TestDirectory, "..", "..", "..", "..", "..", "deploy", "RavenDBServer"));
             var ravenStudio = Path.Combine(ravenServerPath, "Raven.Studio.zip");
@@ -19,13 +18,29 @@ public void CheckForSelfContainedRavenDB()
             var ravenServerExe = Path.Combine(ravenServerPath, "Raven.Server.exe");
             var offlineOperationsUtility = Path.Combine(ravenServerPath, "rvn.exe");
 
-            Assert.Multiple(() =>
+            try
             {
-                Assert.That(ravenStudio, Does.Exist); // No matter what
-                Assert.That(File.Exists(ravenServerDll), Is.EqualTo(isLocal));  // Only in local development
-                Assert.That(File.Exists(ravenServerExe), Is.EqualTo(isCI)); // Only on CI
-                Assert.That(File.Exists(offlineOperationsUtility), Is.EqualTo(isCI));    // Only on CI
-            });
+                Assert.Multiple(() =>
+                {
+                    Assert.That(ravenStudio, Does.Exist); // As of 6.2.3 this exists in embedded & self-contained versions
+                    Assert.That(ravenServerDll, Does.Exist);  // As of 6.2.3 this exists in embedded & self-contained versions
+                    if (isCI)
+                    {
+                        // These may not exist on a local build and that's OK, but they must exist in a self-contained build
+                        Assert.That(ravenServerExe, Does.Exist);
+                        Assert.That(offlineOperationsUtility, Does.Exist);
+                    }
+                });
+            }
+            catch (Exception)
+            {
+                TestContext.Out.WriteLine($"Contents of RavenServerPath {ravenServerPath}:");
+                foreach (var name in Directory.GetFileSystemEntries(ravenServerPath))
+                {
+                    TestContext.Out.WriteLine($" * {name}");
+                }
+                throw;
+            }
         }
     }
 }