Merge branch 'master' into licensed_endpoints

Author: PhilBastian

.github/workflows/build-containers.yml

@@ -32,7 +32,7 @@ jobs:
         shell: pwsh
         run: exit $(If ($env:SECRETS_AVAILABLE -eq 'true') { 0 } Else { 1 })
       - name: Checkout
-        uses: actions/checkout@v6.0.2
+        uses: actions/checkout@v6.0.3
         with:
           fetch-depth: 0
       - name: Setup .NET SDK

.github/workflows/build-db-container.yml

@@ -16,7 +16,7 @@ jobs:
         shell: pwsh
         run: exit $(If ($env:SECRETS_AVAILABLE -eq 'true') { 0 } Else { 1 })
       - name: Checkout
-        uses: actions/checkout@v6.0.2
+        uses: actions/checkout@v6.0.3
         with:
           fetch-depth: 0
       - name: Setup .NET SDK

.github/workflows/build-windows.yml

@@ -12,7 +12,7 @@ jobs:
           SECRETS_AVAILABLE: ${{ secrets.SECRETS_AVAILABLE }}
         run: exit $(If ($env:SECRETS_AVAILABLE -eq 'true') { 0 } Else { 1 })
       - name: Checkout
-        uses: actions/checkout@v6.0.2
+        uses: actions/checkout@v6.0.3
         with:
           fetch-depth: 0
       - name: Setup .NET SDK

.github/workflows/ci.yml

@@ -36,7 +36,7 @@ jobs:
           SECRETS_AVAILABLE: ${{ secrets.SECRETS_AVAILABLE }}
         run: exit $(If ($env:SECRETS_AVAILABLE -eq 'true') { 0 } Else { 1 })
       - name: Checkout
-        uses: actions/checkout@v6.0.2
+        uses: actions/checkout@v6.0.3
         with:
           fetch-depth: 0
       - name: Setup .NET SDK

.github/workflows/container-integration-test.yml

@@ -50,7 +50,7 @@ jobs:
         shell: pwsh
         run: exit $(If ($env:SECRETS_AVAILABLE -eq 'true') { 0 } Else { 1 })
       - name: Checkout
-        uses: actions/checkout@v6.0.2
+        uses: actions/checkout@v6.0.3
         with:
           fetch-depth: 0
       - name: Setup .NET SDK

.github/workflows/push-container-images.yml

@@ -15,7 +15,7 @@ jobs:
         shell: pwsh
     steps:
       - name: Checkout
-        uses: actions/checkout@v6.0.2
+        uses: actions/checkout@v6.0.3
       - name: Validate build version
         id: validate
         uses: ./.github/actions/validate-version

docs/test-ghcr-tag-aspire/AppHost.cs

@@ -0,0 +1,51 @@
+#:sdk Aspire.AppHost.Sdk@13.4.0
+#:package Particular.Aspire.Hosting.ServicePlatform@1.*
+#:package Aspire.Hosting.RabbitMQ@13.4.0
+
+using Aspire.Hosting;
+using Particular.Aspire.Hosting.ServicePlatform.Transport;
+
+var builder = DistributedApplication.CreateBuilder(args);
+
+var transportUserName = builder.AddParameter("transportUserName", "guest", secret: true);
+var transportPassword = builder.AddParameter("transportPassword", "guest", secret: true);
+
+var transport = builder.AddRabbitMQ("transport", transportUserName, transportPassword)
+    .WithManagementPlugin(15672)
+    .WithUrlForEndpoint("management", url => url.DisplayText = "RabbitMQ Management");
+
+builder
+    .AddParticularPlatform("particular")
+    .WithTransportRabbitMQ(RabbitMqRouting.QuorumConventionalRouting, transport)
+    .AddDefaultComponents();
+
+//using positional param for now since there's only one
+if (args.Length > 1)
+{
+    UsePrereleaseImage(builder, args[1]);
+} else {
+    Console.WriteLine("No arguments provided, defaulting to published 'latest' images'");
+}
+
+var app = builder.Build();
+
+await app.RunAsync();
+
+static void UsePrereleaseImage(IDistributedApplicationBuilder builder, string tag)
+{
+    Console.WriteLine($"Using prerelease image tag: {tag}");
+    foreach (var c in builder.Resources.OfType<ContainerResource>())
+    {
+        if (!c.TryGetLastAnnotation<ContainerImageAnnotation>(out var image))
+        {
+            continue;
+        }
+
+        if (image.Image.StartsWith("particular/servicecontrol"))
+        {
+            builder
+                .CreateResourceBuilder(c)
+                .WithImage($"ghcr.io/{image.Image}", tag);
+        }
+    }
+}

docs/test-ghcr-tag-aspire/aspire.config.json

@@ -0,0 +1,5 @@
+{
+  "appHost": {
+    "path": "AppHost.cs"
+  }
+}

docs/testing.md

@@ -63,3 +63,22 @@ Containers built by a PR and stored on GitHub Container Registry can be tested l
     * [Monitoring API](http://localhost:33633)
     * [ServicePulse (latest from Docker Hub)](http://localhost:9090)
 6. Tear down services using `docker compose down`.
+
+
+## Container tests using Aspire
+
+The [Particular.Aspire.Hosting.ServicePlatform](https://github.com/Particular/Particular.Aspire.Hosting.ServicePlatform) package integrates the Particular Platform with the Aspire hosting platform. This package configures environment variables to attach the platform. There is a single file apphost in [`test-ghcr-tag-aspire`](/docs/test-ghcr-tag-aspire) to start up serviceconrol from a prerelease container image.
+
+Containers built by a PR and stored on GitHub Container Registry can be tested locally:
+
+1. Set up your github container registry credentials as described in the [Container tests](#container-tests) section above.
+2. Make sure you have the [Aspire CLI installed](https://aspire.dev/get-started/install-cli/).
+3. Run `aspire run docs/test-ghcr-tag-aspire/AppHost.cs -- tag` to start the application, where `tag` is the PR-based tag (in the form `pr-####`) to test. If no tag is provided, it will default to the `latest` tag.
+4. Once running you can open the dashboard from the link in the terminal, this dashboard will provide the assigned ports for each service.
+    * RabbitMQ Management (Login: `guest`/`guest`)
+    * RavenDB
+    * ServiceControl API
+    * Audit API
+    * Monitoring API
+    * ServicePulse (latest from Docker Hub)
+5. Aspire will automatically tear down the application when you exit the CLI process.

src/Directory.Packages.props

@@ -16,37 +16,36 @@
     <PackageVersion Include="Fody" Version="6.9.3" />
     <PackageVersion Include="GitHubActionsTestLogger" Version="3.0.4" />
     <PackageVersion Include="HdrHistogram" Version="2.5.0" />
-    <PackageVersion Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="10.0.8" />
-    <PackageVersion Include="Microsoft.AspNetCore.Authentication.OpenIdConnect" Version="10.0.8" />
-    <PackageVersion Include="Microsoft.AspNetCore.Mvc.Testing" Version="10.0.8" />
-    <PackageVersion Include="Microsoft.AspNetCore.SignalR.Client" Version="10.0.8" />
-    <PackageVersion Include="Microsoft.Extensions.DependencyInjection" Version="10.0.8" />
-    <PackageVersion Include="Microsoft.Extensions.DependencyModel" Version="10.0.8" />
-    <PackageVersion Include="Microsoft.Extensions.Hosting" Version="10.0.8" />
-    <PackageVersion Include="Microsoft.Extensions.Hosting.Abstractions" Version="10.0.8" />
-    <PackageVersion Include="Microsoft.Extensions.Hosting.WindowsServices" Version="10.0.8" />
-    <PackageVersion Include="Microsoft.Extensions.Logging.Abstractions" Version="10.0.8" />
-    <PackageVersion Include="Microsoft.Extensions.Logging.Console" Version="10.0.8" />
-    <PackageVersion Include="Microsoft.Extensions.TimeProvider.Testing" Version="10.6.0" />
+    <PackageVersion Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="10.0.9" />
+    <PackageVersion Include="Microsoft.AspNetCore.Authentication.OpenIdConnect" Version="10.0.9" />
+    <PackageVersion Include="Microsoft.AspNetCore.Mvc.Testing" Version="10.0.9" />
+    <PackageVersion Include="Microsoft.AspNetCore.SignalR.Client" Version="10.0.9" />
+    <PackageVersion Include="Microsoft.Extensions.DependencyInjection" Version="10.0.9" />
+    <PackageVersion Include="Microsoft.Extensions.DependencyModel" Version="10.0.9" />
+    <PackageVersion Include="Microsoft.Extensions.Hosting" Version="10.0.9" />
+    <PackageVersion Include="Microsoft.Extensions.Hosting.Abstractions" Version="10.0.9" />
+    <PackageVersion Include="Microsoft.Extensions.Hosting.WindowsServices" Version="10.0.9" />
+    <PackageVersion Include="Microsoft.Extensions.Logging.Abstractions" Version="10.0.9" />
+    <PackageVersion Include="Microsoft.Extensions.Logging.Console" Version="10.0.9" />
+    <PackageVersion Include="Microsoft.Extensions.TimeProvider.Testing" Version="10.7.0" />
     <PackageVersion Include="Microsoft.IdentityModel.Protocols.OpenIdConnect" Version="8.18.0" />
     <PackageVersion Include="Microsoft.IdentityModel.Tokens" Version="8.18.0" />
     <PackageVersion Include="Microsoft.NET.Test.Sdk" Version="18.6.0" />
     <PackageVersion Include="Microsoft-WindowsAPICodePack-Shell" Version="1.1.5" />
     <PackageVersion Include="Mindscape.Raygun4Net.NetCore" Version="11.2.5" />
     <PackageVersion Include="NLog.Extensions.Logging" Version="6.1.3" />
-    <PackageVersion Include="NServiceBus" Version="10.1.4" />
-    <PackageVersion Include="NServiceBus.AcceptanceTesting" Version="10.1.4" />
+    <PackageVersion Include="NServiceBus" Version="10.2.5" />
+    <PackageVersion Include="NServiceBus.AcceptanceTesting" Version="10.2.5" />
     <PackageVersion Include="NServiceBus.AmazonSQS" Version="9.0.1" />
     <PackageVersion Include="NServiceBus.CustomChecks" Version="6.0.1" />
-    <PackageVersion Include="NServiceBus.Extensions.Hosting" Version="4.0.1" />
-    <PackageVersion Include="NServiceBus.Extensions.Logging" Version="4.0.1" />
+    <PackageVersion Include="NServiceBus.Extensions.Logging" Version="4.1.0" />
     <PackageVersion Include="NServiceBus.Heartbeat" Version="6.0.1" />
     <PackageVersion Include="NServiceBus.Metrics" Version="6.0.1" />
     <PackageVersion Include="NServiceBus.Metrics.ServiceControl" Version="6.0.1" />
     <PackageVersion Include="NServiceBus.Persistence.NonDurable" Version="3.0.1" />
     <PackageVersion Include="NServiceBus.RabbitMQ" Version="11.2.1" />
     <PackageVersion Include="NServiceBus.SagaAudit" Version="6.0.1" />
-    <PackageVersion Include="NServiceBus.Testing" Version="10.0.2" />
+    <PackageVersion Include="NServiceBus.Testing" Version="10.1.0" />
     <PackageVersion Include="NServiceBus.Transport.AzureServiceBus" Version="6.3.0" />
     <PackageVersion Include="NServiceBus.Transport.AzureStorageQueues" Version="14.0.1" />
     <PackageVersion Include="NServiceBus.Transport.Msmq.Sources" Version="4.0.1" />
@@ -73,21 +72,25 @@
     <PackageVersion Include="ReactiveUI.WPF" Version="22.3.1" />
     <PackageVersion Include="Seq.Extensions.Logging" Version="9.0.0" />
     <PackageVersion Include="ServiceControl.Contracts" Version="5.1.0" />
-    <PackageVersion Include="System.Configuration.ConfigurationManager" Version="10.0.8" />
-    <PackageVersion Include="System.Diagnostics.PerformanceCounter" Version="10.0.8" />
-    <PackageVersion Include="System.DirectoryServices.AccountManagement" Version="10.0.8" />
+    <PackageVersion Include="System.Configuration.ConfigurationManager" Version="10.0.9" />
+    <PackageVersion Include="System.Diagnostics.PerformanceCounter" Version="10.0.9" />
+    <PackageVersion Include="System.DirectoryServices.AccountManagement" Version="10.0.9" />
     <PackageVersion Include="System.IdentityModel.Tokens.Jwt" Version="8.18.0" />
-    <PackageVersion Include="System.Management" Version="10.0.8" />
+    <PackageVersion Include="System.Management" Version="10.0.9" />
     <PackageVersion Include="System.Management.Automation" Version="7.6.1" />
     <PackageVersion Include="System.Reactive" Version="6.1.0" />
-    <PackageVersion Include="System.Reflection.MetadataLoadContext" Version="10.0.8" />
-    <PackageVersion Include="System.ServiceProcess.ServiceController" Version="10.0.8" />
+    <PackageVersion Include="System.Reflection.MetadataLoadContext" Version="10.0.9" />
+    <PackageVersion Include="System.ServiceProcess.ServiceController" Version="10.0.9" />
     <PackageVersion Include="Validar.Fody" Version="1.9.0" />
     <PackageVersion Include="Yarp.ReverseProxy" Version="2.3.0" />
   </ItemGroup>
   <ItemGroup Label="Versions to pin transitive references">
+    <PackageVersion Include="Microsoft.Extensions.Caching.Memory" Version="10.0.9" />
     <PackageVersion Include="Microsoft.IdentityModel.Abstractions" Version="8.18.0" />
-    <PackageVersion Include="System.IO.Hashing" Version="10.0.8" />
+    <PackageVersion Include="System.Formats.Cbor" Version="10.0.9" />
+    <PackageVersion Include="System.IO.Hashing" Version="10.0.9" />
+    <PackageVersion Include="System.Security.Cryptography.Pkcs" Version="10.0.9" />
+    <PackageVersion Include="System.Threading.RateLimiting" Version="10.0.9" />
   </ItemGroup>
   <ItemGroup>
     <GlobalPackageReference Include="Microsoft.Build.Artifacts" Version="6.1.63" />