From 74fa3e0df1b24b2ad38745a722a6d2c8a0dc9af6 Mon Sep 17 00:00:00 2001 From: Brandon Ording Date: Wed, 19 Aug 2026 16:58:07 -0400 Subject: [PATCH 1/3] Use Particular.Approvals for approvals (#5797) (cherry picked from commit 04bc5fb1b91dafda681530378d40884166a27271) --- src/Directory.Packages.props | 1 - ...s_and_routes_under_pinned_field_names.approved.txt | 1 + ...s_and_routes_under_pinned_field_names.verified.txt | 11 ----------- .../Auth/RouteManifestEntrySerializationTests.cs | 7 +++---- .../ServiceControl.Infrastructure.Tests.csproj | 2 +- 5 files changed, 5 insertions(+), 17 deletions(-) create mode 100644 src/ServiceControl.Infrastructure.Tests/ApprovalFiles/RouteManifestEntrySerializationTests.Response_wraps_roles_and_routes_under_pinned_field_names.approved.txt delete mode 100644 src/ServiceControl.Infrastructure.Tests/Auth/RouteManifestEntrySerializationTests.Response_wraps_roles_and_routes_under_pinned_field_names.verified.txt diff --git a/src/Directory.Packages.props b/src/Directory.Packages.props index 55a637e359..b26bca2161 100644 --- a/src/Directory.Packages.props +++ b/src/Directory.Packages.props @@ -94,7 +94,6 @@ - diff --git a/src/ServiceControl.Infrastructure.Tests/ApprovalFiles/RouteManifestEntrySerializationTests.Response_wraps_roles_and_routes_under_pinned_field_names.approved.txt b/src/ServiceControl.Infrastructure.Tests/ApprovalFiles/RouteManifestEntrySerializationTests.Response_wraps_roles_and_routes_under_pinned_field_names.approved.txt new file mode 100644 index 0000000000..92fd36a197 --- /dev/null +++ b/src/ServiceControl.Infrastructure.Tests/ApprovalFiles/RouteManifestEntrySerializationTests.Response_wraps_roles_and_routes_under_pinned_field_names.approved.txt @@ -0,0 +1 @@ +{"roles":["admin"],"routes":[{"method":"GET","url_template":"/api/errors"}]} \ No newline at end of file diff --git a/src/ServiceControl.Infrastructure.Tests/Auth/RouteManifestEntrySerializationTests.Response_wraps_roles_and_routes_under_pinned_field_names.verified.txt b/src/ServiceControl.Infrastructure.Tests/Auth/RouteManifestEntrySerializationTests.Response_wraps_roles_and_routes_under_pinned_field_names.verified.txt deleted file mode 100644 index ed2dd257ef..0000000000 --- a/src/ServiceControl.Infrastructure.Tests/Auth/RouteManifestEntrySerializationTests.Response_wraps_roles_and_routes_under_pinned_field_names.verified.txt +++ /dev/null @@ -1,11 +0,0 @@ -{ - roles: [ - admin - ], - routes: [ - { - method: GET, - url_template: /api/errors - } - ] -} \ No newline at end of file diff --git a/src/ServiceControl.Infrastructure.Tests/Auth/RouteManifestEntrySerializationTests.cs b/src/ServiceControl.Infrastructure.Tests/Auth/RouteManifestEntrySerializationTests.cs index 3d72610362..2c2efe9a11 100644 --- a/src/ServiceControl.Infrastructure.Tests/Auth/RouteManifestEntrySerializationTests.cs +++ b/src/ServiceControl.Infrastructure.Tests/Auth/RouteManifestEntrySerializationTests.cs @@ -2,10 +2,9 @@ namespace ServiceControl.Infrastructure.Tests.Auth; using System.Text.Json; -using System.Threading.Tasks; using NUnit.Framework; +using Particular.Approvals; using ServiceControl.Infrastructure.Auth; -using VerifyNUnit; [TestFixture] class RouteManifestEntrySerializationTests @@ -30,12 +29,12 @@ public void Emits_snake_case_field_names_even_under_a_camelCase_policy() // Same contract as above, but for the response wrapper: roles are reported once at the top level, // not duplicated onto every route entry. [Test] - public Task Response_wraps_roles_and_routes_under_pinned_field_names() + public void Response_wraps_roles_and_routes_under_pinned_field_names() { var json = JsonSerializer.Serialize( new MyRoutesResponse(["admin"], [new RouteManifestEntry("GET", "/api/errors")]), new JsonSerializerOptions { PropertyNamingPolicy = JsonNamingPolicy.CamelCase }); - return Verifier.VerifyJson(json); + Approver.Verify(json); } } diff --git a/src/ServiceControl.Infrastructure.Tests/ServiceControl.Infrastructure.Tests.csproj b/src/ServiceControl.Infrastructure.Tests/ServiceControl.Infrastructure.Tests.csproj index 7664d8aa63..1980f88aef 100644 --- a/src/ServiceControl.Infrastructure.Tests/ServiceControl.Infrastructure.Tests.csproj +++ b/src/ServiceControl.Infrastructure.Tests/ServiceControl.Infrastructure.Tests.csproj @@ -17,7 +17,7 @@ - + \ No newline at end of file From 1ec652f59d58494a0d6bc10b71126c98afd86186 Mon Sep 17 00:00:00 2001 From: Brandon Ording Date: Wed, 19 Aug 2026 15:43:36 -0400 Subject: [PATCH 2/3] Update RuntimeFrameworkVersion to 10.0.11 (#5795) (cherry picked from commit 0f202b4920d272df7cd6fd2b310b983812a2f948) --- src/Custom.Build.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Custom.Build.props b/src/Custom.Build.props index 6f3833a7c4..ff19f9735b 100644 --- a/src/Custom.Build.props +++ b/src/Custom.Build.props @@ -14,7 +14,7 @@ - 10.0.10 + 10.0.11 Disable From b7104a3367121a78d7ccdb7f03fe734a15b90041 Mon Sep 17 00:00:00 2001 From: Tamara Rivera Date: Wed, 19 Aug 2026 14:34:52 -0700 Subject: [PATCH 3/3] Update dependency Particular.ServicePulse.Core to 2.10.2 --- src/Directory.Packages.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Directory.Packages.props b/src/Directory.Packages.props index b26bca2161..ea2ef2af6f 100644 --- a/src/Directory.Packages.props +++ b/src/Directory.Packages.props @@ -71,7 +71,7 @@ - +