Run ServiceControl Management as a self-contained app

.github/workflows/ci.yml

@@ -33,11 +33,9 @@ jobs:
       - name: Setup .NET SDK
         uses: actions/setup-dotnet@v3.2.0
         with:
-          dotnet-version: 6.0.x
-      - name: Add msbuild to PATH
-        uses: microsoft/setup-msbuild@v1.3
+          dotnet-version: 7.0.x
       - name: Build
-        run: msbuild src -p:Configuration=Release -restore -m -verbosity:minimal
+        run: dotnet build src --configuration Release -graph
       - name: Zip PowerShell module
         run: |
           New-Item assets\PowerShellModules -ItemType Directory

.github/workflows/release.yml

@@ -28,11 +28,11 @@ jobs:
       - name: Setup .NET SDK
         uses: actions/setup-dotnet@v3.2.0
         with:
-          dotnet-version: 6.0.x
-      - name: Add msbuild to PATH
-        uses: microsoft/setup-msbuild@v1.3
+          dotnet-version: 7.0.x
       - name: Build
-        run: msbuild src -p:Configuration=Release -restore -m -verbosity:minimal
+        run: dotnet build src --configuration Release -graph
+      - name: Build ServiceControl Management
+        run: dotnet publish src\ServiceControl.Config\ServiceControl.Config.csproj --configuration Release --runtime win-x64 --no-build --output assets
       - name: Sign NuGet packages
         uses: Particular/sign-nuget-packages-action@v1.0.0
         with:
@@ -44,6 +44,20 @@ jobs:
         run: New-FileCatalog -Path deploy\PowerShellModules\Particular.ServiceControl.Management -CatalogFilePath deploy\PowerShellModules\Particular.ServiceControl.Management\Particular.ServiceControl.Management.cat -CatalogVersion 2.0
       - name: Install AzureSignTool
         run: dotnet tool install --global azuresigntool
+      - name: Sign ServiceControl Management EXE
+        run: |
+          AzureSignTool sign `
+          --file-digest sha256 `
+          --timestamp-rfc3161 http://timestamp.digicert.com `
+          --azure-key-vault-url https://particularcodesigning.vault.azure.net `
+          --azure-key-vault-client-id ${{ secrets.AZURE_KEY_VAULT_CLIENT_ID }} `
+          --azure-key-vault-tenant-id ${{ secrets.AZURE_KEY_VAULT_TENANT_ID }} `
+          --azure-key-vault-client-secret ${{ secrets.AZURE_KEY_VAULT_CLIENT_SECRET }} `
+          --azure-key-vault-certificate ${{ secrets.AZURE_KEY_VAULT_CERTIFICATE_NAME }} `
+          assets\Particular.ServiceControl.exe
+      - name: Rename ServiceControl Management EXE
+        run: Rename-Item -Path assets\Particular.ServiceControl.exe -NewName "Particular.ServiceControl-${{ env.MinVerVersion }}.exe"
+        shell: pwsh
       - name: Sign PowerShell module
         run: |
           AzureSignTool sign `
@@ -59,20 +73,6 @@ jobs:
         run: |
           New-Item assets\PowerShellModules -ItemType Directory
           Compress-Archive -Path deploy\PowerShellModules\Particular.ServiceControl.Management\* -DestinationPath assets\PowerShellModules\Particular.ServiceControl.Management.zip
-      - name: Setup Advanced Installer
-        run: |
-          $version = "20.2.1"
-          choco install advanced-installer --version=$version
-          & "C:\Program Files (x86)\Caphyon\Advanced Installer $version\bin\x86\AdvancedInstaller.com" /register ${{ secrets.ADVANCED_INSTALLER_LICENSE_KEY }}
-      - name: Prepare AIP file
-        run: |
-          $content = Get-Content -Raw -Path src/Setup/ServiceControl.aip
-          $content = $content -replace "replace-tenant-id", "${{ secrets.AZURE_KEY_VAULT_TENANT_ID }}" -replace "replace-app-id", "${{ secrets.AZURE_KEY_VAULT_CLIENT_ID }}" -replace "replace-cert-name", "${{ secrets.AZURE_KEY_VAULT_CERTIFICATE_NAME }}"
-          Set-Content src/Setup/ServiceControl.aip $content
-      - name: Build Windows installer
-        env:
-          AZURE_KEY_VAULT_CLIENT_SECRET: ${{ secrets.AZURE_KEY_VAULT_CLIENT_SECRET }}
-        run: dotnet build src/Setup --configuration Release
       # - name: Build Docker images
       #   if: ${{ github.event_name == 'push' && github.ref_type == 'tag' }}
       #   run: dotnet build src/ServiceControl.DockerImages --configuration Release
@@ -105,9 +105,9 @@ jobs:
           $nugetsCount =  (Get-ChildItem -Recurse -File nugets).Count
           $zipCount = (Get-ChildItem -Recurse -File zip).Count
 
-          $expectedAssetsCount = 2
-          $expectedNugetsCount = 1
-          $expectedZipCount = 3
+          $expectedAssetsCount = 2 # SCMU & PowerShell module
+          $expectedNugetsCount = 1 # PlatformSample
+          $expectedZipCount = 3    # ServiceControl, Audit, & Monitoring
 
           if ($assetsCount -ne $expectedAssetsCount)
           {

src/Directory.Packages.props

@@ -29,7 +29,7 @@
     <PackageVersion Include="Microsoft.IO.RecyclableMemoryStream" Version="2.3.2" />
     <PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.7.2" />
     <PackageVersion Include="Microsoft.Owin.Cors" Version="4.2.2" />
-    <PackageVersion Include="Mindscape.Raygun4Net" Version="6.0.3" />
+    <PackageVersion Include="Mindscape.Raygun4Net.NetCore" Version="7.1.0" />
     <PackageVersion Include="Newtonsoft.Json" Version="13.0.3" />
     <PackageVersion Include="NLog.Extensions.Logging" Version="5.3.3" />
     <PackageVersion Include="NServiceBus" Version="7.8.4" />
@@ -73,8 +73,7 @@
     <PackageVersion Include="System.Text.Json" Version="7.0.3" />
     <PackageVersion Include="System.Threading.Channels" Version="7.0.0" />
     <PackageVersion Include="Validar.Fody" Version="1.9.0" />
-    <PackageVersion Include="Windows7APICodePack-Shell" Version="1.1.0" />
-    <PackageVersion Include="WixToolset.Dtf.CustomAction" Version="4.0.2" />
+    <PackageVersion Include="Microsoft-WindowsAPICodePack-Shell" Version="1.1.5" />
   </ItemGroup>
 
   <ItemGroup Label="Versions to pin transitive references">

src/ServiceControl.Audit.AcceptanceTests.RavenDB5/AcceptanceTestStorageConfiguration.cs

@@ -2,6 +2,7 @@
 {
     using System;
     using System.Collections.Generic;
+    using System.Threading;
     using System.Threading.Tasks;
     using ServiceControl.Audit.Persistence.RavenDb;
     using ServiceControl.Audit.Persistence.Tests;
@@ -10,15 +11,17 @@ class AcceptanceTestStorageConfiguration
     {
         public string PersistenceType { get; protected set; }
 
+        EmbeddedDatabase databaseInstance;
+        string databaseName;
+
         public async Task<IDictionary<string, string>> CustomizeSettings()
         {
-            var databaseName = Guid.NewGuid().ToString();
-
-            var instance = await SharedEmbeddedServer.GetInstance();
+            databaseName = Guid.NewGuid().ToString();
+            databaseInstance = await SharedEmbeddedServer.GetInstance();
 
             return new Dictionary<string, string>
             {
-                { RavenDbPersistenceConfiguration.ConnectionStringKey,instance.ServerUrl },
+                { RavenDbPersistenceConfiguration.ConnectionStringKey,databaseInstance.ServerUrl },
                 { RavenDbPersistenceConfiguration.DatabaseNameKey,databaseName}
             };
         }
@@ -30,9 +33,9 @@ public Task Configure()
             return Task.CompletedTask;
         }
 
-        public Task Cleanup()
+        public async Task Cleanup()
         {
-            return Task.CompletedTask;
+            await databaseInstance.DeleteDatabase(databaseName);
         }
     }
 }

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

@@ -12,6 +12,7 @@
     using NServiceBus.Logging;
     using Raven.Client.Documents;
     using Raven.Client.Documents.Conventions;
+    using Raven.Client.ServerWide.Operations;
     using Raven.Embedded;
 
     public class EmbeddedDatabase : IDisposable
@@ -148,6 +149,14 @@ public async Task<IDocumentStore> Connect(CancellationToken cancellationToken)
             return store;
         }
 
+        public async Task DeleteDatabase(string dbName)
+        {
+            using (var store = await EmbeddedServer.Instance.GetDocumentStoreAsync(new DatabaseOptions(dbName) { SkipCreatingDatabase = true }))
+            {
+                await store.Maintenance.Server.SendAsync(new DeleteDatabasesOperation(dbName, true));
+            }
+        }
+
         public void Dispose()
         {
             shutdownTokenSource.Cancel();

src/ServiceControl.Audit.Persistence.Tests.RavenDb5/ApprovalFiles/InstallationTests.Should_write_expected_config_file.approved.txt

@@ -8,6 +8,8 @@
         <add key="ServiceControl.Audit/TransportType" value="ServiceControl.Transports.Msmq.MsmqTransportCustomization, ServiceControl.Transports.Msmq" />
         <add key="ServiceControl.Audit/PersistenceType" value="ServiceControl.Audit.Persistence.RavenDb.RavenDbPersistenceConfiguration, ServiceControl.Audit.Persistence.RavenDb5" />
         <add key="ServiceControl.Audit/AuditRetentionPeriod" value="00:00:00" />
+        <add key="ServiceControl.Audit/EnableFullTextSearchOnBodies"
+            value="false" />
         <add key="ServiceControl.Audit/DBPath" value="value-not-asserted" />
         <add key="ServiceControl.Audit/DatabaseMaintenancePort" value="33333" />
     </appSettings>

src/ServiceControl.Audit.Persistence.Tests/ApprovalFiles/InstallationTests.Should_write_expected_config_file.approved.txt

@@ -8,6 +8,8 @@
         <add key="ServiceControl.Audit/TransportType" value="ServiceControl.Transports.Msmq.MsmqTransportCustomization, ServiceControl.Transports.Msmq" />
         <add key="ServiceControl.Audit/PersistenceType" value="ServiceControl.Audit.Persistence.InMemory.InMemoryPersistenceConfiguration, ServiceControl.Audit.Persistence.InMemory" />
         <add key="ServiceControl.Audit/AuditRetentionPeriod" value="00:00:00" />
+        <add key="ServiceControl.Audit/EnableFullTextSearchOnBodies"
+            value="false" />
     </appSettings>
     <runtime>
         <gcServer enabled="true" />

src/ServiceControl.Audit.Persistence.Tests/InstallationTests.cs

@@ -1,6 +1,5 @@
 namespace ServiceControl.Audit.Persistence.Tests
 {
-    using System;
     using System.IO;
     using System.Linq;
     using System.Text.Json;
@@ -21,7 +20,7 @@ public void Should_write_expected_config_file()
                 persistenceManifest = JsonSerializer.Deserialize<PersistenceManifest>(manifestContent);
             }
 
-            var newInstance = new ServiceControlAuditNewInstance(new Version(1, 0, 0), persistenceManifest);
+            var newInstance = new ServiceControlAuditNewInstance(persistenceManifest);
 
             var installPath = Path.Combine(Path.GetTempPath(), TestContext.CurrentContext.Test.ID, "install");
 

src/ServiceControl.Config.Tests/ServiceControl.Config.Tests.csproj

@@ -1,20 +1,15 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net472</TargetFramework>
+    <TargetFramework>net7.0-windows10.0.17763.0</TargetFramework>
+    <PlatformTarget>x64</PlatformTarget>
   </PropertyGroup>
 
   <ItemGroup>
     <ProjectReference Include="..\ServiceControl.Config\ServiceControl.Config.csproj" />
     <ProjectReference Include="..\TestHelper\TestHelper.csproj" />
   </ItemGroup>
 
-  <ItemGroup>
-    <Reference Include="System.DirectoryServices.AccountManagement" />
-    <Reference Include="System.Messaging" />
-    <Reference Include="System.ServiceProcess" />
-  </ItemGroup>
-
   <ItemGroup>
     <PackageReference Include="GitHubActionsTestLogger" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" />

src/ServiceControl.Config/App.xaml.cs

@@ -2,8 +2,6 @@
 {
     using System;
     using System.Diagnostics;
-    using System.IO;
-    using System.Reflection;
     using UI.MessageBox;
 
     public partial class App
@@ -23,29 +21,12 @@ public App()
         [STAThread]
         public static void Main(string[] args)
         {
-            AppDomain.CurrentDomain.AssemblyResolve += (s, e) => ResolveAssembly(e.Name);
-
-            Splash.Show();
             if (args.Length == 0)
             {
+                Splash.Show();
                 var app = new App();
                 app.Run();
             }
         }
-
-        static Assembly ResolveAssembly(string name)
-        {
-            var assemblyLocation = Assembly.GetEntryAssembly().Location;
-            var appDirectory = Path.GetDirectoryName(assemblyLocation);
-            var requestingName = new AssemblyName(name).Name;
-
-            var combine = Path.Combine(appDirectory, requestingName + ".dll");
-            if (!File.Exists(combine))
-            {
-                return null;
-            }
-
-            return Assembly.LoadFrom(combine);
-        }
     }
 }

src/ServiceControl.Config/AppBootstrapper.cs

@@ -11,6 +11,8 @@
     using Caliburn.Micro;
     using FluentValidation;
     using ReactiveUI;
+    using ServiceControl.Config.Framework;
+    using ServiceControlInstaller.Engine.Validation;
     using UI.Shell;
 
     public class AppBootstrapper : BootstrapperBase
@@ -87,6 +89,14 @@ protected override async void OnStartup(object sender, StartupEventArgs e)
             ValidatorOptions.Global.DefaultRuleLevelCascadeMode = CascadeMode.Stop;
 
             await DisplayRootViewForAsync<ShellViewModel>();
+
+            if (DotnetVersionValidator.FrameworkRequirementsAreMissing(true, out var message))
+            {
+                message += $"{Environment.NewLine}{Environment.NewLine}Until the prerequisites are installed, no ServiceControl instances can be installed.";
+
+                var windowManager = GetInstance(typeof(IServiceControlWindowManager), null) as IServiceControlWindowManager;
+                await windowManager.ShowMessage("Missing prerequisites", message, acceptText: "I understand", hideCancel: true);
+            }
         }
 
         IContainer container;

src/ServiceControl.Config/Commands/UpgradeAuditInstanceCommand.cs

@@ -13,6 +13,7 @@
     using ServiceControlInstaller.Engine.Configuration.ServiceControl;
     using ServiceControlInstaller.Engine.Instances;
     using ServiceControlInstaller.Engine.ReportCard;
+    using ServiceControlInstaller.Engine.Validation;
     using UI.InstanceDetails;
 
     class UpgradeAuditInstanceCommand : AwaitableAbstractCommand<InstanceDetailsViewModel>
@@ -95,6 +96,12 @@ public override async Task ExecuteAsync(InstanceDetailsViewModel model)
                 }
             }
 
+            if (DotnetVersionValidator.FrameworkRequirementsAreMissing(needsRavenDB: true, out var missingMessage))
+            {
+                await windowManager.ShowMessage("Missing prerequisites", missingMessage, acceptText: "Cancel", hideCancel: true);
+                return;
+            }
+
             if (instance.TransportPackage.IsOldRabbitMQTransport() &&
                 !await windowManager.ShowYesNoDialog("UPGRADE WARNING", $"ServiceControl version {serviceControlInstaller.ZipInfo.Version} requires RabbitMQ broker version 3.10.0 or higher. Also, the stream_queue and quorum_queue feature flags must be enabled on the broker. Please confirm your broker meets the minimum requirements before upgrading.",
                    "Do you want to proceed?",

src/ServiceControl.Config/Commands/UpgradeMonitoringInstanceCommand.cs

@@ -11,6 +11,7 @@
     using ServiceControl.Engine.Extensions;
     using ServiceControlInstaller.Engine.Instances;
     using ServiceControlInstaller.Engine.ReportCard;
+    using ServiceControlInstaller.Engine.Validation;
     using UI.InstanceDetails;
 
     class UpgradeMonitoringInstanceCommand : AwaitableAbstractCommand<InstanceDetailsViewModel>
@@ -46,6 +47,12 @@ public override async Task ExecuteAsync(InstanceDetailsViewModel model)
 
             instance.Service.Refresh();
 
+            if (DotnetVersionValidator.FrameworkRequirementsAreMissing(needsRavenDB: false, out var missingMessage))
+            {
+                await windowManager.ShowMessage("Missing prerequisites", missingMessage, acceptText: "Cancel", hideCancel: true);
+                return;
+            }
+
             if (instance.TransportPackage.IsOldRabbitMQTransport() &&
                 !await windowManager.ShowYesNoDialog("UPGRADE WARNING", $"ServiceControl version {installer.ZipInfo.Version} requires RabbitMQ broker version 3.10.0 or higher. Also, the stream_queue and quorum_queue feature flags must be enabled on the broker. Please confirm your broker meets the minimum requirements before upgrading.",
                    "Do you want to proceed?",

src/ServiceControl.Config/Commands/UpgradeServiceControlInstanceCommand.cs

@@ -224,6 +224,12 @@ await windowManager.ShowMessage("UPGRADE INCOMPATIBLE",
                 }
             }
 
+            if (DotnetVersionValidator.FrameworkRequirementsAreMissing(needsRavenDB: true, out var missingMessage))
+            {
+                await windowManager.ShowMessage("Missing prerequisites", missingMessage, acceptText: "Cancel", hideCancel: true);
+                return;
+            }
+
             if (instance.TransportPackage.IsOldRabbitMQTransport() &&
                 !await windowManager.ShowYesNoDialog("UPGRADE WARNING", $"ServiceControl version {serviceControlInstaller.ZipInfo.Version} requires RabbitMQ broker version 3.10.0 or higher. Also, the stream_queue and quorum_queue feature flags must be enabled on the broker. Please confirm your broker meets the minimum requirements before upgrading.",
                    "Do you want to proceed?",

src/ServiceControl.Config/Extensions/FilePathExtensions.cs

@@ -9,6 +9,12 @@ public static class FilePathExtensions
     {
         static bool TryGetPathRoot(string path, out string root)
         {
+            if (string.IsNullOrWhiteSpace(path))
+            {
+                root = string.Empty;
+                return false;
+            }
+
             try
             {
                 root = Path.GetPathRoot(path);