Ensure RavenDB download script is used when WindowsSelfContained is true

Particular · Mar 4, 2024 · 956903b · danielmarbach · Mar 4, 2024 · 956903b
1 parent 0bbfa12
commit 956903b
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/src/ServiceControl.Persistence.RavenDB/ServiceControl.Persistence.RavenDB.csproj b/src/ServiceControl.Persistence.RavenDB/ServiceControl.Persistence.RavenDB.csproj
@@ -32,7 +32,8 @@
     a CI build, this is skipped because the CI and Release workflows have already downloaded a self-contained version of RavenDB
     to that location already.
     -->
-    <Artifact Condition="'$(CI)' != 'true'" Include="$(OutputPath)\RavenDBServer" DestinationFolder="$(ArtifactsPath)RavenDBServer" />
+    <!-- This is also skipped when WindowsSelfContained is true to ensure a self-contained RavenDB is embedded. -->
+    <Artifact Condition="'$(CI)' != 'true' And '$(WindowsSelfContained)' != 'true'" Include="$(OutputPath)\RavenDBServer" DestinationFolder="$(ArtifactsPath)RavenDBServer" />
   </ItemGroup>
 
 </Project>
diff --git a/src/ServiceControlInstaller.Packaging/ServiceControlInstaller.Packaging.csproj b/src/ServiceControlInstaller.Packaging/ServiceControlInstaller.Packaging.csproj
@@ -40,6 +40,7 @@
   </Target>
 
   <Target Name="PrepareCreateZipFiles" DependsOnTargets="GetDuplicateInstanceFiles">
+    <Error Condition="!Exists('$(ArtifactsPath)$(RavenDBServer)')" Text="The 'download-ravendb-server.ps1' PowerShell script needs to be run before building when running a CI or WindowsSelfContained build." />
     <ItemGroup>
       <PrimaryFilesToZip Include="$(ArtifactsPath)$(Primary)\**\*" />
       <AuditFilesToZip Include="$(ArtifactsPath)$(Audit)\**\*" />