From 7af236ee65f9d8ca8c21a521ebce658dc8ec57d2 Mon Sep 17 00:00:00 2001 From: Brandon Ording Date: Thu, 5 Feb 2026 14:05:32 -0500 Subject: [PATCH 1/6] Remove unneeded AWSSDK.SecurityToken reference --- src/Directory.Packages.props | 1 - 1 file changed, 1 deletion(-) diff --git a/src/Directory.Packages.props b/src/Directory.Packages.props index d2288025c3..b618baa167 100644 --- a/src/Directory.Packages.props +++ b/src/Directory.Packages.props @@ -6,7 +6,6 @@ - From 00f06a4f272b346c701656181e64ac259319b90c Mon Sep 17 00:00:00 2001 From: Brandon Ording Date: Thu, 5 Feb 2026 14:13:50 -0500 Subject: [PATCH 2/6] Sort packages --- src/Directory.Packages.props | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/Directory.Packages.props b/src/Directory.Packages.props index b618baa167..2290cf5397 100644 --- a/src/Directory.Packages.props +++ b/src/Directory.Packages.props @@ -26,13 +26,12 @@ - + - @@ -53,8 +52,8 @@ - + @@ -63,8 +62,8 @@ - + @@ -77,6 +76,7 @@ + From ba330483359dce210a9d84ce1949f2f861711054 Mon Sep 17 00:00:00 2001 From: Brandon Ording Date: Thu, 5 Feb 2026 15:08:55 -0500 Subject: [PATCH 3/6] Clean up packages --- src/Directory.Packages.props | 4 +--- .../ServiceControl.Persistence.RavenDB.csproj | 2 +- src/ServiceControl/ServiceControl.csproj | 1 - 3 files changed, 2 insertions(+), 5 deletions(-) diff --git a/src/Directory.Packages.props b/src/Directory.Packages.props index 2290cf5397..9d3c57dbdd 100644 --- a/src/Directory.Packages.props +++ b/src/Directory.Packages.props @@ -25,9 +25,7 @@ - - @@ -79,7 +77,7 @@ - + diff --git a/src/ServiceControl.Persistence.RavenDB/ServiceControl.Persistence.RavenDB.csproj b/src/ServiceControl.Persistence.RavenDB/ServiceControl.Persistence.RavenDB.csproj index 2c9a2273c9..e121d7e979 100644 --- a/src/ServiceControl.Persistence.RavenDB/ServiceControl.Persistence.RavenDB.csproj +++ b/src/ServiceControl.Persistence.RavenDB/ServiceControl.Persistence.RavenDB.csproj @@ -24,7 +24,7 @@ - + diff --git a/src/ServiceControl/ServiceControl.csproj b/src/ServiceControl/ServiceControl.csproj index 1b8e30e8eb..f4d7a787bb 100644 --- a/src/ServiceControl/ServiceControl.csproj +++ b/src/ServiceControl/ServiceControl.csproj @@ -37,7 +37,6 @@ - From 361c02604ad5767a668dd8fb0c80c103bd585967 Mon Sep 17 00:00:00 2001 From: Brandon Ording Date: Thu, 5 Feb 2026 15:21:20 -0500 Subject: [PATCH 4/6] Clean up pinned transitive references --- src/Directory.Packages.props | 7 ------- 1 file changed, 7 deletions(-) diff --git a/src/Directory.Packages.props b/src/Directory.Packages.props index 9d3c57dbdd..01d42a1fe2 100644 --- a/src/Directory.Packages.props +++ b/src/Directory.Packages.props @@ -84,15 +84,8 @@ - - - - - - - From 5b525fbfb90efc839216472c136d6aacaa2021df Mon Sep 17 00:00:00 2001 From: Brandon Ording Date: Thu, 5 Feb 2026 14:19:05 -0500 Subject: [PATCH 5/6] Remove unused testing app --- .../DatabaseMigrationsTester.csproj | 11 ----- src/DatabaseMigrationsTester/Program.cs | 49 ------------------- 2 files changed, 60 deletions(-) delete mode 100644 src/DatabaseMigrationsTester/DatabaseMigrationsTester.csproj delete mode 100644 src/DatabaseMigrationsTester/Program.cs diff --git a/src/DatabaseMigrationsTester/DatabaseMigrationsTester.csproj b/src/DatabaseMigrationsTester/DatabaseMigrationsTester.csproj deleted file mode 100644 index bb9b6209a8..0000000000 --- a/src/DatabaseMigrationsTester/DatabaseMigrationsTester.csproj +++ /dev/null @@ -1,11 +0,0 @@ - - - - net452 - Exe - - - - - - diff --git a/src/DatabaseMigrationsTester/Program.cs b/src/DatabaseMigrationsTester/Program.cs deleted file mode 100644 index 5bc48be47d..0000000000 --- a/src/DatabaseMigrationsTester/Program.cs +++ /dev/null @@ -1,49 +0,0 @@ -namespace DatabaseMigrationsTester -{ - using System; - using System.Threading; - - class Program - { - static int Main(string[] args) - { - var command = (Command)Enum.Parse(typeof(Command), args[0]); - switch (command) - { - case Command.Throw: - throw new Exception("Boom!"); - case Command.Return0: - return 0; - case Command.WriteToErrorAndExitNonZero: - Console.Error.WriteLine("Some error message"); - return 1; - case Command.WriteToErrorAndExitZero: - Console.Error.WriteLine("Some error message"); - return 0; - case Command.Timeout: - Thread.Sleep(100000); - return 0; - case Command.UpdateProgress: - Console.Out.WriteLine("Updating schema from version: 1"); - Console.Out.WriteLine("Updating schema from version: 2"); - Console.Out.WriteLine("Updating schema from version: 3"); - Console.Out.WriteLine("OK Upgrading"); - Console.Out.WriteLine("2018-05-25 114744.7193|101|Error|Raven.Database.Storage>indexDefinitionStorage|Failed..."); - Console.Out.WriteLine("OK"); - return 0; - } - - return 0; - } - } - - enum Command - { - Throw, - Timeout, - Return0, - WriteToErrorAndExitNonZero, - WriteToErrorAndExitZero, - UpdateProgress - } -} \ No newline at end of file From 5dc1c0d1408600a641855d4d05e738b95d8d8b16 Mon Sep 17 00:00:00 2001 From: Brandon Ording Date: Thu, 5 Feb 2026 14:26:16 -0500 Subject: [PATCH 6/6] Format SetupInstanceTests stuff --- .../Setup/SetupInstanceTests.cs | 1 - src/SetupProcessFake/SetupProcessFake.csproj | 12 ++++++------ 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/src/ServiceControlInstaller.Engine.UnitTests/Setup/SetupInstanceTests.cs b/src/ServiceControlInstaller.Engine.UnitTests/Setup/SetupInstanceTests.cs index ada58aceaa..e8c67cfc77 100644 --- a/src/ServiceControlInstaller.Engine.UnitTests/Setup/SetupInstanceTests.cs +++ b/src/ServiceControlInstaller.Engine.UnitTests/Setup/SetupInstanceTests.cs @@ -1,7 +1,6 @@ namespace ServiceControlInstaller.Engine.UnitTests.Setup; using System; -using System.Threading; using Engine.Setup; using NUnit.Framework; diff --git a/src/SetupProcessFake/SetupProcessFake.csproj b/src/SetupProcessFake/SetupProcessFake.csproj index 6c1dc922b1..f1e3f3693d 100644 --- a/src/SetupProcessFake/SetupProcessFake.csproj +++ b/src/SetupProcessFake/SetupProcessFake.csproj @@ -1,10 +1,10 @@  - - Exe - net10.0 - enable - enable - + + net10.0 + Exe + enable + enable +