Optimize binaries

.github/workflows/release.yml

@@ -107,7 +107,7 @@ jobs:
 
           $expectedAssetsCount = 2 # SCMU & PowerShell module
           $expectedNugetsCount = 1 # PlatformSample
-          $expectedZipCount = 3    # ServiceControl, Audit, & Monitoring
+          $expectedZipCount = 5    # ServiceControl, Audit, & Monitoring + Transports & RavenDBServer
 
           if ($assetsCount -ne $expectedAssetsCount)
           {

src/Custom.Build.props

@@ -18,12 +18,6 @@
     <WriteMinVerProperties>false</WriteMinVerProperties>
   </PropertyGroup>
 
-  <ItemGroup>
-    <InstanceName Include="Particular.ServiceControl" />
-    <InstanceName Include="Particular.ServiceControl.Audit" />
-    <InstanceName Include="Particular.ServiceControl.Monitoring" />
-  </ItemGroup>
-
   <!-- workaround for https://github.com/microsoft/MSBuildSdks/issues/477 -->
   <PropertyGroup>
     <UseArtifactsOutput>false</UseArtifactsOutput>

src/Directory.Packages.props

@@ -15,7 +15,6 @@
     <PackageVersion Include="FluentValidation" Version="11.8.0" />
     <PackageVersion Include="GitHubActionsTestLogger" Version="2.3.3" />
     <PackageVersion Include="HdrHistogram" Version="2.5.0" />
-    <PackageVersion Include="Lucene.Net" Version="3.0.3" />
     <PackageVersion Include="Metrics.NET" Version="0.5.5" />
     <PackageVersion Include="Microsoft.AspNet.SignalR" Version="2.4.3" />
     <PackageVersion Include="Microsoft.AspNet.SignalR.Client" Version="2.4.3" />

src/Particular.PlatformSample.ServiceControl/Particular.PlatformSample.ServiceControl.csproj

@@ -23,14 +23,16 @@
   <Target Name="AddFilesToPackage">
     <ItemGroup>
       <TfmSpecificPackageFile Include="$(ArtifactsPath)Particular.ServiceControl\ServiceControl\**\*" PackagePath="platform\servicecontrol\servicecontrol-instance" />
-      <TfmSpecificPackageFile Include="$(ArtifactsPath)Particular.ServiceControl\Transports\LearningTransport\**\*" PackagePath="platform\servicecontrol\servicecontrol-instance" />
+      <TfmSpecificPackageFile Include="$(ArtifactsPath)Particular.ServiceControl\Persisters\RavenDB5\**\*" PackagePath="platform\servicecontrol\servicecontrol-instance" />
+      <TfmSpecificPackageFile Include="$(ArtifactsPath)Transports\LearningTransport\**\*" PackagePath="platform\servicecontrol\servicecontrol-instance" />
+      <TfmSpecificPackageFile Include="$(ArtifactsPath)RavenDBServer\**\*" PackagePath="platform\servicecontrol\servicecontrol-instance\RavenDBServer" />
 
       <TfmSpecificPackageFile Include="$(ArtifactsPath)Particular.ServiceControl.Audit\ServiceControl.Audit\**\*" PackagePath="platform\servicecontrol\servicecontrol-audit-instance" />
       <TfmSpecificPackageFile Include="$(ArtifactsPath)Particular.ServiceControl.Audit\Persisters\InMemory\**\*" PackagePath="platform\servicecontrol\servicecontrol-audit-instance" />
-      <TfmSpecificPackageFile Include="$(ArtifactsPath)Particular.ServiceControl.Audit\Transports\LearningTransport\**\*" PackagePath="platform\servicecontrol\servicecontrol-audit-instance" />
+      <TfmSpecificPackageFile Include="$(ArtifactsPath)Transports\LearningTransport\**\*" PackagePath="platform\servicecontrol\servicecontrol-audit-instance" />
 
       <TfmSpecificPackageFile Include="$(ArtifactsPath)Particular.ServiceControl.Monitoring\ServiceControl.Monitoring\**\*" PackagePath="platform\servicecontrol\monitoring-instance" />
-      <TfmSpecificPackageFile Include="$(ArtifactsPath)Particular.ServiceControl.Monitoring\Transports\LearningTransport\**\*" PackagePath="platform\servicecontrol\monitoring-instance" />
+      <TfmSpecificPackageFile Include="$(ArtifactsPath)Transports\LearningTransport\**\*" PackagePath="platform\servicecontrol\monitoring-instance" />
     </ItemGroup>
   </Target>
 

src/ServiceControl.AcceptanceTesting/ServiceControl.AcceptanceTesting.csproj

@@ -6,7 +6,6 @@
 
   <ItemGroup>
     <ProjectReference Include="..\ServiceControl.Transports.Learning\ServiceControl.Transports.Learning.csproj" />
-    <ProjectReference Include="..\ServiceControlInstaller.Engine\ServiceControlInstaller.Engine.csproj" />
     <ProjectReference Include="..\TestHelper\TestHelper.csproj" />
   </ItemGroup>
 

src/ServiceControl.AcceptanceTests.RavenDB5/ServiceControl.AcceptanceTests.RavenDB5.csproj

@@ -11,7 +11,6 @@
     <ProjectReference Include="..\ServiceControl.Persistence.RavenDb5\ServiceControl.Persistence.RavenDb5.csproj" />
     <ProjectReference Include="..\ServiceControl.Transports.Learning\ServiceControl.Transports.Learning.csproj" />
     <ProjectReference Include="..\ServiceControl\ServiceControl.csproj" />
-    <ProjectReference Include="..\ServiceControlInstaller.Engine\ServiceControlInstaller.Engine.csproj" />
     <ProjectReference Include="..\TestHelper\TestHelper.csproj" />
   </ItemGroup>
 

src/ServiceControl.AcceptanceTests/Recoverability/When_a_native_integration_message_is_retried.cs

@@ -11,7 +11,6 @@
     using NServiceBus.Transport;
     using NUnit.Framework;
     using ServiceControl.MessageFailures.Api;
-    using ServiceControlInstaller.Engine.Instances;
     using TestSupport.EndpointTemplates;
     using Conventions = NServiceBus.AcceptanceTesting.Customization.Conventions;
 
@@ -36,16 +35,13 @@ public async Task Should_not_corrupt_headers()
                 .Run();
 
             // ASQ adds this value to it's message wrapper and writes the incoming message header
-            if (TransportIntegration.Name != TransportNames.AzureStorageQueue)
+            if (TransportIntegration.Name != "Azure Storage Queue")
             {
                 Assert.False(context.Headers.ContainsKey(Headers.MessageIntent), "Should not add the intent header");
             }
 
             //Rabbit defaults the header when deserializing the message based on the IBasicProperties.DeliveryMode
-            if (TransportIntegration.Name == TransportNames.RabbitMQClassicConventionalRoutingTopology ||
-                TransportIntegration.Name == TransportNames.RabbitMQQuorumConventionalRoutingTopology ||
-                TransportIntegration.Name == TransportNames.RabbitMQClassicDirectRoutingTopology ||
-                TransportIntegration.Name == TransportNames.RabbitMQQuorumDirectRoutingTopology)
+            if (TransportIntegration.Name.Contains("RabbitMQ"))
             {
                 Assert.AreEqual("False", context.Headers[Headers.NonDurableMessage], "Should not corrupt the non-durable header");
             }

src/ServiceControl.Audit.AcceptanceTests/ServiceControl.Audit.AcceptanceTests.csproj

@@ -11,7 +11,6 @@
     <ProjectReference Include="..\ServiceControl.Audit\ServiceControl.Audit.csproj" />
     <ProjectReference Include="..\ServiceControl.Audit.Persistence.InMemory\ServiceControl.Audit.Persistence.InMemory.csproj" />
     <ProjectReference Include="..\ServiceControl.Transports.Learning\ServiceControl.Transports.Learning.csproj" />
-    <ProjectReference Include="..\ServiceControlInstaller.Engine\ServiceControlInstaller.Engine.csproj" />
     <ProjectReference Include="..\TestHelper\TestHelper.csproj" />
   </ItemGroup>
 

src/ServiceControl.Audit.Persistence.InMemory/ServiceControl.Audit.Persistence.InMemory.csproj

@@ -5,7 +5,8 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\ServiceControl.Audit.Persistence\ServiceControl.Audit.Persistence.csproj" />
+    <!-- Private=false & ExcludeAssets=runtime prevent repeatedly including binary dependencies of ServiceControl.Persistence in each persister directory -->
+    <ProjectReference Include="..\ServiceControl.Audit.Persistence\ServiceControl.Audit.Persistence.csproj" Private="false" ExcludeAssets="runtime" />
   </ItemGroup>
 
   <ItemGroup>

src/ServiceControl.Audit.Persistence.RavenDb5/Indexes/MessagesViewIndex.cs

@@ -2,7 +2,6 @@ namespace ServiceControl.Audit.Persistence.RavenDb.Indexes
 {
     using System;
     using System.Linq;
-    using Lucene.Net.Analysis.Standard;
     using Raven.Client.Documents.Indexes;
     using ServiceControl.Audit.Auditing;
     using ServiceControl.Audit.Monitoring;
@@ -34,7 +33,8 @@ from message in messages
 
             Index(x => x.Query, FieldIndexing.Search);
 
-            Analyze(x => x.Query, typeof(StandardAnalyzer).AssemblyQualifiedName);
+            // Not using typeof() to prevent dependency on Lucene
+            Analyze(x => x.Query, "Lucene.Net.Analysis.Standard.StandardAnalyzer, Lucene.Net, Version=3.0.3.0, Culture=neutral, PublicKeyToken=85089178b9ac3181");
         }
 
         public class SortAndFilterOptions

src/ServiceControl.Audit.Persistence.RavenDb5/Indexes/MessagesViewIndexWithFullTextSearch.cs

@@ -2,7 +2,6 @@ namespace ServiceControl.Audit.Persistence.RavenDb.Indexes
 {
     using System;
     using System.Linq;
-    using Lucene.Net.Analysis.Standard;
     using Raven.Client.Documents.Indexes;
     using ServiceControl.Audit.Auditing;
     using ServiceControl.Audit.Monitoring;
@@ -35,7 +34,8 @@ from message in messages
 
             Index(x => x.Query, FieldIndexing.Search);
 
-            Analyze(x => x.Query, typeof(StandardAnalyzer).AssemblyQualifiedName);
+            // Not using typeof() to prevent dependency on Lucene
+            Analyze(x => x.Query, "Lucene.Net.Analysis.Standard.StandardAnalyzer, Lucene.Net, Version=3.0.3.0, Culture=neutral, PublicKeyToken=85089178b9ac3181");
         }
     }
 }

src/ServiceControl.Audit.Persistence.RavenDb5/RavenDbPersistenceConfiguration.cs

@@ -39,7 +39,7 @@ internal static DatabaseConfiguration GetDatabaseConfiguration(PersistenceSettin
         {
             if (!settings.PersisterSpecificSettings.TryGetValue(DatabaseNameKey, out var databaseName))
             {
-                databaseName = "primary";
+                databaseName = "audit";
             }
 
             ServerConfiguration serverConfiguration;

src/ServiceControl.Audit.Persistence.RavenDb5/ServiceControl.Audit.Persistence.RavenDb5.csproj

@@ -5,12 +5,12 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\ServiceControl.Audit.Persistence\ServiceControl.Audit.Persistence.csproj" />
+    <!-- Private=false & ExcludeAssets=runtime prevent repeatedly including binary dependencies of ServiceControl.Persistence in each persister directory -->
+    <ProjectReference Include="..\ServiceControl.Audit.Persistence\ServiceControl.Audit.Persistence.csproj" Private="false" ExcludeAssets="runtime" />
   </ItemGroup>
 
   <ItemGroup>
     <PackageReference Include="ByteSize" />
-    <PackageReference Include="Lucene.Net" />
     <PackageReference Include="NServiceBus.CustomChecks" />
     <PackageReference Include="RavenDB.Embedded" />
   </ItemGroup>
@@ -21,7 +21,8 @@
   </ItemGroup>
 
   <ItemGroup>
-    <Artifact Include="$(OutputPath)" DestinationFolder="$(ArtifactsPath)Particular.ServiceControl.Audit\Persisters\RavenDB5" />
+    <!-- Artifact does not include RavenDBServer directory. Primary instance is responsible for copying that to deploy directory. -->
+    <Artifact Include="$(OutputPath)" DirExclude="RavenDBServer" DestinationFolder="$(ArtifactsPath)Particular.ServiceControl.Audit\Persisters\RavenDB5" />
   </ItemGroup>
 
   <ItemGroup>

src/ServiceControl.Audit.Persistence.Tests.RavenDb5/ServiceControl.Audit.Persistence.Tests.RavenDb5.csproj

@@ -6,7 +6,8 @@
 
   <ItemGroup>
     <ProjectReference Include="..\ServiceControl.Audit.Persistence.RavenDb5\ServiceControl.Audit.Persistence.RavenDb5.csproj" />
-    <ProjectReference Include="..\ServiceControlInstaller.Engine\ServiceControlInstaller.Engine.csproj" />
+    <!-- Needed to bring the dependencies that the persistence plugin excludes -->
+    <ProjectReference Include="..\ServiceControl.Audit.Persistence\ServiceControl.Audit.Persistence.csproj" />
     <ProjectReference Include="..\TestHelper\TestHelper.csproj" />
   </ItemGroup>
 

src/ServiceControl.Audit.Persistence.Tests/ServiceControl.Audit.Persistence.Tests.csproj

@@ -6,7 +6,8 @@
 
   <ItemGroup>
     <ProjectReference Include="..\ServiceControl.Audit.Persistence.InMemory\ServiceControl.Audit.Persistence.InMemory.csproj" />
-    <ProjectReference Include="..\ServiceControlInstaller.Engine\ServiceControlInstaller.Engine.csproj" />
+    <!-- Needed to bring the dependencies that the persistence plugin excludes -->
+    <ProjectReference Include="..\ServiceControl.Audit.Persistence\ServiceControl.Audit.Persistence.csproj" />
     <ProjectReference Include="..\TestHelper\TestHelper.csproj" />
   </ItemGroup>
 

src/ServiceControl.Monitoring.AcceptanceTests/ServiceControl.Monitoring.AcceptanceTests.csproj

@@ -2,14 +2,13 @@
 
   <PropertyGroup>
     <TargetFramework>net472</TargetFramework>
-    <LangVersion>8</LangVersion>
+    <LangVersion>8.0</LangVersion>
   </PropertyGroup>
 
   <ItemGroup>
     <ProjectReference Include="..\ServiceControl.AcceptanceTesting\ServiceControl.AcceptanceTesting.csproj" />
     <ProjectReference Include="..\ServiceControl.Monitoring\ServiceControl.Monitoring.csproj" />
     <ProjectReference Include="..\ServiceControl.Transports.Learning\ServiceControl.Transports.Learning.csproj" />
-    <ProjectReference Include="..\ServiceControlInstaller.Engine\ServiceControlInstaller.Engine.csproj" />
     <ProjectReference Include="..\TestHelper\TestHelper.csproj" />
   </ItemGroup>
 
@@ -19,13 +18,13 @@
 
   <ItemGroup>
     <PackageReference Include="GitHubActionsTestLogger" />
+    <PackageReference Include="HdrHistogram" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" />
     <PackageReference Include="NServiceBus.AcceptanceTesting" />
     <PackageReference Include="NServiceBus.Metrics" />
     <PackageReference Include="NServiceBus.Metrics.ServiceControl" />
     <PackageReference Include="NUnit" />
     <PackageReference Include="NUnit3TestAdapter" />
-    <PackageReference Include="HdrHistogram" />
     <PackageReference Include="OwinHttpMessageHandler" />
   </ItemGroup>
 

src/ServiceControl.MultiInstance.AcceptanceTests/ServiceControl.MultiInstance.AcceptanceTests.csproj

@@ -12,7 +12,6 @@
     <ProjectReference Include="..\ServiceControl.Audit\ServiceControl.Audit.csproj" />
     <ProjectReference Include="..\ServiceControl.Persistence.RavenDb5\ServiceControl.Persistence.RavenDb5.csproj" />
     <ProjectReference Include="..\ServiceControl.Transports.Learning\ServiceControl.Transports.Learning.csproj" />
-    <ProjectReference Include="..\ServiceControlInstaller.Engine\ServiceControlInstaller.Engine.csproj" />
     <ProjectReference Include="..\TestHelper\TestHelper.csproj" />
   </ItemGroup>
 

src/ServiceControl.Persistence.RavenDb5/Indexes/MessagesViewIndex.cs

@@ -2,7 +2,6 @@ namespace ServiceControl.Persistence
 {
     using System;
     using System.Linq;
-    using Lucene.Net.Analysis.Standard;
     using Raven.Client.Documents.Indexes;
     using ServiceControl.MessageFailures;
     using ServiceControl.Operations;
@@ -37,9 +36,8 @@ from message in messages
                     ConversationId = (string)last.MessageMetadata["ConversationId"]
                 };
 
+            // StandardAnalyzer is the default analyzer, so no follow-up Analyze() call is needed here
             Index(x => x.Query, FieldIndexing.Search);
-
-            Analyze(x => x.Query, typeof(StandardAnalyzer).AssemblyQualifiedName);
         }
 
         public class SortAndFilterOptions