From b9b006b93874a6573f97dff12a70632244898f6e Mon Sep 17 00:00:00 2001 From: StuartFerguson Date: Thu, 11 Jun 2026 16:11:03 +0100 Subject: [PATCH] Centralize NuGet package version management Moved all NuGet package versioning to Directory.Packages.props for central management. Removed explicit Version attributes from .csproj files and updated all project references accordingly. Updated Shared.sln Solution Items to include Directory.Packages.props. Minor code cleanups included. --- ClientProxyBase/ClientProxyBase.csproj | 10 ++--- Directory.Packages.props | 43 +++++++++++++++++++ Driver/Driver.csproj | 8 ++-- .../ApplicationBuilderExtensionsTests.cs | 2 +- .../Shared.EventStore.Tests.csproj | 22 +++++----- Shared.EventStore/Shared.EventStore.csproj | 16 +++---- .../Shared.EventStoreContext.Tests.csproj | 18 ++++---- .../Shared.IntegrationTesting.Tests.csproj | 24 +++++------ ...Shared.IntegrationTesting.UnitTests.csproj | 18 ++++---- .../Shared.IntegrationTesting.csproj | 24 +++++------ Shared.Logger/Shared.Logger.csproj | 4 +- Shared.Results.Web/Shared.Results.Web.csproj | 2 +- Shared.Results/Shared.Results.csproj | 4 +- Shared.Tests/ConfigurationReaderTests.cs | 1 - Shared.Tests/Shared.Tests.csproj | 24 +++++------ Shared.sln | 14 +++--- Shared/Shared.csproj | 14 +++--- 17 files changed, 144 insertions(+), 104 deletions(-) create mode 100644 Directory.Packages.props diff --git a/ClientProxyBase/ClientProxyBase.csproj b/ClientProxyBase/ClientProxyBase.csproj index 7677d47c..c2d720f0 100644 --- a/ClientProxyBase/ClientProxyBase.csproj +++ b/ClientProxyBase/ClientProxyBase.csproj @@ -5,11 +5,11 @@ - - - - - + + + + + diff --git a/Directory.Packages.props b/Directory.Packages.props new file mode 100644 index 00000000..79e10163 --- /dev/null +++ b/Directory.Packages.props @@ -0,0 +1,43 @@ + + + true + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/Driver/Driver.csproj b/Driver/Driver.csproj index 118fdd22..d290df00 100644 --- a/Driver/Driver.csproj +++ b/Driver/Driver.csproj @@ -7,10 +7,10 @@ - - - - + + + + diff --git a/Shared.EventStore.Tests/ApplicationBuilderExtensionsTests.cs b/Shared.EventStore.Tests/ApplicationBuilderExtensionsTests.cs index c6eda842..02c2089a 100644 --- a/Shared.EventStore.Tests/ApplicationBuilderExtensionsTests.cs +++ b/Shared.EventStore.Tests/ApplicationBuilderExtensionsTests.cs @@ -11,7 +11,7 @@ using Shared.EventStore.SubscriptionWorker; using Shouldly; using Xunit; -using Xunit.Abstractions; +//using Xunit.Abstractions; namespace Shared.EventStore.Tests; diff --git a/Shared.EventStore.Tests/Shared.EventStore.Tests.csproj b/Shared.EventStore.Tests/Shared.EventStore.Tests.csproj index 2aa8317b..3568ebc8 100644 --- a/Shared.EventStore.Tests/Shared.EventStore.Tests.csproj +++ b/Shared.EventStore.Tests/Shared.EventStore.Tests.csproj @@ -12,20 +12,20 @@ - - + + all runtime; build; native; contentfiles; analyzers; buildtransitive - - - - - - - - - + + + + + + + + + all runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/Shared.EventStore/Shared.EventStore.csproj b/Shared.EventStore/Shared.EventStore.csproj index 08b7d15f..6df58c80 100644 --- a/Shared.EventStore/Shared.EventStore.csproj +++ b/Shared.EventStore/Shared.EventStore.csproj @@ -6,15 +6,15 @@ - - - - - - - + + + + + + + - + diff --git a/Shared.EventStoreContext.Tests/Shared.EventStoreContext.Tests.csproj b/Shared.EventStoreContext.Tests/Shared.EventStoreContext.Tests.csproj index b720dd9a..cb8e5539 100644 --- a/Shared.EventStoreContext.Tests/Shared.EventStoreContext.Tests.csproj +++ b/Shared.EventStoreContext.Tests/Shared.EventStoreContext.Tests.csproj @@ -10,21 +10,21 @@ - - - - - - - + + + + + + + all runtime; build; native; contentfiles; analyzers; buildtransitive - + all runtime; build; native; contentfiles; analyzers; buildtransitive - + diff --git a/Shared.IntegrationTesting.Tests/Shared.IntegrationTesting.Tests.csproj b/Shared.IntegrationTesting.Tests/Shared.IntegrationTesting.Tests.csproj index d47b75c5..3817c0e7 100644 --- a/Shared.IntegrationTesting.Tests/Shared.IntegrationTesting.Tests.csproj +++ b/Shared.IntegrationTesting.Tests/Shared.IntegrationTesting.Tests.csproj @@ -10,21 +10,21 @@ - - - - - - - - - - - + + + + + + + + + + + runtime; build; native; contentfiles; analyzers; buildtransitive all - + diff --git a/Shared.IntegrationTesting.UnitTests/Shared.IntegrationTesting.UnitTests.csproj b/Shared.IntegrationTesting.UnitTests/Shared.IntegrationTesting.UnitTests.csproj index 80ac9439..5d8bfb98 100644 --- a/Shared.IntegrationTesting.UnitTests/Shared.IntegrationTesting.UnitTests.csproj +++ b/Shared.IntegrationTesting.UnitTests/Shared.IntegrationTesting.UnitTests.csproj @@ -10,18 +10,18 @@ - - - - - - - - + + + + + + + + runtime; build; native; contentfiles; analyzers; buildtransitive all - + runtime; build; native; contentfiles; analyzers; buildtransitive all diff --git a/Shared.IntegrationTesting/Shared.IntegrationTesting.csproj b/Shared.IntegrationTesting/Shared.IntegrationTesting.csproj index e746ed52..07c93db9 100644 --- a/Shared.IntegrationTesting/Shared.IntegrationTesting.csproj +++ b/Shared.IntegrationTesting/Shared.IntegrationTesting.csproj @@ -6,18 +6,18 @@ - - - - - - - - - - - - + + + + + + + + + + + + diff --git a/Shared.Logger/Shared.Logger.csproj b/Shared.Logger/Shared.Logger.csproj index 32bd7289..15a08764 100644 --- a/Shared.Logger/Shared.Logger.csproj +++ b/Shared.Logger/Shared.Logger.csproj @@ -6,7 +6,7 @@ enable - - + + diff --git a/Shared.Results.Web/Shared.Results.Web.csproj b/Shared.Results.Web/Shared.Results.Web.csproj index 3805ea4e..cc2248f0 100644 --- a/Shared.Results.Web/Shared.Results.Web.csproj +++ b/Shared.Results.Web/Shared.Results.Web.csproj @@ -7,7 +7,7 @@ - + diff --git a/Shared.Results/Shared.Results.csproj b/Shared.Results/Shared.Results.csproj index 3d611d81..90831ee7 100644 --- a/Shared.Results/Shared.Results.csproj +++ b/Shared.Results/Shared.Results.csproj @@ -7,8 +7,8 @@ - - + + diff --git a/Shared.Tests/ConfigurationReaderTests.cs b/Shared.Tests/ConfigurationReaderTests.cs index f0e71f47..ead3e292 100644 --- a/Shared.Tests/ConfigurationReaderTests.cs +++ b/Shared.Tests/ConfigurationReaderTests.cs @@ -11,7 +11,6 @@ namespace Shared.Tests; using Microsoft.Extensions.Configuration; using Shouldly; using Xunit; -using Xunit.Abstractions; public partial class SharedTests { diff --git a/Shared.Tests/Shared.Tests.csproj b/Shared.Tests/Shared.Tests.csproj index 70d446d0..ad6ed533 100644 --- a/Shared.Tests/Shared.Tests.csproj +++ b/Shared.Tests/Shared.Tests.csproj @@ -7,25 +7,25 @@ - - + + all runtime; build; native; contentfiles; analyzers; buildtransitive - - - - + + + + - - - - + + + + all runtime; build; native; contentfiles; analyzers; buildtransitive - - + + diff --git a/Shared.sln b/Shared.sln index c5443618..5b13b457 100644 --- a/Shared.sln +++ b/Shared.sln @@ -1,7 +1,7 @@  Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio Version 18 -VisualStudioVersion = 18.0.11205.157 d18.0 +VisualStudioVersion = 18.0.11205.157 MinimumVisualStudioVersion = 10.0.40219.1 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Shared", "Shared\Shared.csproj", "{FF85F59D-BE70-438E-9A69-5CE7E50B2E0E}" EndProject @@ -25,13 +25,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Shared.EventStore.Tests", " EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Shared.IntegrationTesting.Tests", "Shared.IntegrationTesting.Tests\Shared.IntegrationTesting.Tests.csproj", "{77D4A6AC-1DEF-4F6D-88C8-35763A1FD9B5}" EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{2F43E6CC-A4C5-4C18-8674-FF5E2E6C1604}" - ProjectSection(SolutionItems) = preProject - .github\workflows\createrelease.yml = .github\workflows\createrelease.yml - nightlybuild.yml = nightlybuild.yml - .github\workflows\pullrequest.yml = .github\workflows\pullrequest.yml - EndProjectSection -EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Shared.EventStoreContext.Tests", "Shared.EventStoreContext.Tests\Shared.EventStoreContext.Tests.csproj", "{A7909DC1-12F9-42F8-B665-E8A2C63B1481}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Shared.IntegrationTesting.UnitTests", "Shared.IntegrationTesting.UnitTests\Shared.IntegrationTesting.UnitTests.csproj", "{5E23CBBB-8484-4F7F-81D9-308957783695}" @@ -42,6 +35,11 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Shared.Results.Web", "Share EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Shared.Logger", "Shared.Logger\Shared.Logger.csproj", "{9A7AF486-C3B6-463D-812E-DD6D5517C7F3}" EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{AAF925EC-8E2D-40EA-BA77-87B097A949D8}" + ProjectSection(SolutionItems) = preProject + Directory.Packages.props = Directory.Packages.props + EndProjectSection +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU diff --git a/Shared/Shared.csproj b/Shared/Shared.csproj index 487b589b..dfd1f67e 100644 --- a/Shared/Shared.csproj +++ b/Shared/Shared.csproj @@ -11,17 +11,17 @@ - - - - - + + + + + all runtime; build; native; contentfiles; analyzers; buildtransitive - + - +