From a61a223144a10c0386f42b07df0af9a211db058d Mon Sep 17 00:00:00 2001 From: Daniel Weber Date: Tue, 10 Sep 2024 13:01:43 +0200 Subject: [PATCH 1/2] Use central package management,. --- Directory.Build.props | 5 +- Directory.Packages.props | 61 +++++++++++++++++++ .../ExRam.Gremlinq.Core.AspNet.csproj | 32 +--------- src/Core/ExRam.Gremlinq.Core.csproj | 6 +- src/Directory.Build.props | 8 +-- ...Ram.Gremlinq.Support.NewtonsoftJson.csproj | 2 +- .../ExRam.Gremlinq.Core.AspNet.Tests.csproj | 2 +- .../ExRam.Gremlinq.Core.Tests.csproj | 2 +- test/Directory.Build.props | 16 ++--- ...inq.Providers.CosmosDb.AspNet.Tests.csproj | 4 +- ...roviders.GremlinServer.AspNet.Tests.csproj | 4 +- ...q.Providers.JanusGraph.AspNet.Tests.csproj | 4 +- ...linq.Providers.Neptune.AspNet.Tests.csproj | 4 +- .../ExRam.Gremlinq.PublicApi.Tests.csproj | 2 +- .../ExRam.Gremlinq.Templates.Tests.csproj | 2 +- .../ExRam.Gremlinq.Tests.Fixtures.csproj | 6 +- ...ExRam.Gremlinq.Tests.Infrastructure.csproj | 2 +- 17 files changed, 99 insertions(+), 63 deletions(-) create mode 100644 Directory.Packages.props diff --git a/Directory.Build.props b/Directory.Build.props index d677444027..b675032ca5 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -1,7 +1,8 @@ true - true + true + true enable true 12.0 @@ -27,6 +28,6 @@ - + \ No newline at end of file diff --git a/Directory.Packages.props b/Directory.Packages.props new file mode 100644 index 0000000000..12503280b0 --- /dev/null +++ b/Directory.Packages.props @@ -0,0 +1,61 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/Core.AspNet/ExRam.Gremlinq.Core.AspNet.csproj b/src/Core.AspNet/ExRam.Gremlinq.Core.AspNet.csproj index e6f849369d..527c7e9916 100644 --- a/src/Core.AspNet/ExRam.Gremlinq.Core.AspNet.csproj +++ b/src/Core.AspNet/ExRam.Gremlinq.Core.AspNet.csproj @@ -4,40 +4,14 @@ ASP.NET Core support package for ExRam.Gremlinq.Core. - - - - - - - - - - - - - - - - - - - - - - - - - - + + + - - - diff --git a/src/Core/ExRam.Gremlinq.Core.csproj b/src/Core/ExRam.Gremlinq.Core.csproj index 33f2390634..49573ba373 100644 --- a/src/Core/ExRam.Gremlinq.Core.csproj +++ b/src/Core/ExRam.Gremlinq.Core.csproj @@ -5,9 +5,9 @@ - - - + + + diff --git a/src/Directory.Build.props b/src/Directory.Build.props index c7640ac019..46fbd684c3 100644 --- a/src/Directory.Build.props +++ b/src/Directory.Build.props @@ -40,12 +40,12 @@ - + - - - + + + \ No newline at end of file diff --git a/src/Support.NewtonsoftJson/ExRam.Gremlinq.Support.NewtonsoftJson.csproj b/src/Support.NewtonsoftJson/ExRam.Gremlinq.Support.NewtonsoftJson.csproj index 0b2dbf8ffe..3a75fd132e 100644 --- a/src/Support.NewtonsoftJson/ExRam.Gremlinq.Support.NewtonsoftJson.csproj +++ b/src/Support.NewtonsoftJson/ExRam.Gremlinq.Support.NewtonsoftJson.csproj @@ -5,7 +5,7 @@ - + diff --git a/test/Core.AspNet.Tests/ExRam.Gremlinq.Core.AspNet.Tests.csproj b/test/Core.AspNet.Tests/ExRam.Gremlinq.Core.AspNet.Tests.csproj index 56f1aedfee..707a54a833 100644 --- a/test/Core.AspNet.Tests/ExRam.Gremlinq.Core.AspNet.Tests.csproj +++ b/test/Core.AspNet.Tests/ExRam.Gremlinq.Core.AspNet.Tests.csproj @@ -6,7 +6,7 @@ - + diff --git a/test/Core.Tests/ExRam.Gremlinq.Core.Tests.csproj b/test/Core.Tests/ExRam.Gremlinq.Core.Tests.csproj index d46f28fdcf..d63a1e2a3e 100644 --- a/test/Core.Tests/ExRam.Gremlinq.Core.Tests.csproj +++ b/test/Core.Tests/ExRam.Gremlinq.Core.Tests.csproj @@ -6,7 +6,7 @@ - + diff --git a/test/Directory.Build.props b/test/Directory.Build.props index 6d356f8a1d..56b62befc7 100644 --- a/test/Directory.Build.props +++ b/test/Directory.Build.props @@ -11,17 +11,17 @@ - - - - - - - + + + + + + + - + \ No newline at end of file diff --git a/test/Providers.CosmosDb.AspNet.Tests/ExRam.Gremlinq.Providers.CosmosDb.AspNet.Tests.csproj b/test/Providers.CosmosDb.AspNet.Tests/ExRam.Gremlinq.Providers.CosmosDb.AspNet.Tests.csproj index 32558f59cb..dfc628a40d 100644 --- a/test/Providers.CosmosDb.AspNet.Tests/ExRam.Gremlinq.Providers.CosmosDb.AspNet.Tests.csproj +++ b/test/Providers.CosmosDb.AspNet.Tests/ExRam.Gremlinq.Providers.CosmosDb.AspNet.Tests.csproj @@ -3,8 +3,8 @@ - - + + diff --git a/test/Providers.GremlinServer.AspNet.Tests/ExRam.Gremlinq.Providers.GremlinServer.AspNet.Tests.csproj b/test/Providers.GremlinServer.AspNet.Tests/ExRam.Gremlinq.Providers.GremlinServer.AspNet.Tests.csproj index 9937138b32..5128444fbe 100644 --- a/test/Providers.GremlinServer.AspNet.Tests/ExRam.Gremlinq.Providers.GremlinServer.AspNet.Tests.csproj +++ b/test/Providers.GremlinServer.AspNet.Tests/ExRam.Gremlinq.Providers.GremlinServer.AspNet.Tests.csproj @@ -3,8 +3,8 @@ - - + + diff --git a/test/Providers.JanusGraph.AspNet.Tests/ExRam.Gremlinq.Providers.JanusGraph.AspNet.Tests.csproj b/test/Providers.JanusGraph.AspNet.Tests/ExRam.Gremlinq.Providers.JanusGraph.AspNet.Tests.csproj index fcb5030410..fa7b6129b0 100644 --- a/test/Providers.JanusGraph.AspNet.Tests/ExRam.Gremlinq.Providers.JanusGraph.AspNet.Tests.csproj +++ b/test/Providers.JanusGraph.AspNet.Tests/ExRam.Gremlinq.Providers.JanusGraph.AspNet.Tests.csproj @@ -3,8 +3,8 @@ - - + + diff --git a/test/Providers.Neptune.AspNet.Tests/ExRam.Gremlinq.Providers.Neptune.AspNet.Tests.csproj b/test/Providers.Neptune.AspNet.Tests/ExRam.Gremlinq.Providers.Neptune.AspNet.Tests.csproj index 0d5a9efa12..55d6d6eac5 100644 --- a/test/Providers.Neptune.AspNet.Tests/ExRam.Gremlinq.Providers.Neptune.AspNet.Tests.csproj +++ b/test/Providers.Neptune.AspNet.Tests/ExRam.Gremlinq.Providers.Neptune.AspNet.Tests.csproj @@ -3,8 +3,8 @@ - - + + diff --git a/test/PublicApi.Tests/ExRam.Gremlinq.PublicApi.Tests.csproj b/test/PublicApi.Tests/ExRam.Gremlinq.PublicApi.Tests.csproj index e6aa3a71aa..8cb8a72a26 100644 --- a/test/PublicApi.Tests/ExRam.Gremlinq.PublicApi.Tests.csproj +++ b/test/PublicApi.Tests/ExRam.Gremlinq.PublicApi.Tests.csproj @@ -1,7 +1,7 @@  - + diff --git a/test/Templates.Tests/ExRam.Gremlinq.Templates.Tests.csproj b/test/Templates.Tests/ExRam.Gremlinq.Templates.Tests.csproj index 327a5316c7..2d0785b5de 100644 --- a/test/Templates.Tests/ExRam.Gremlinq.Templates.Tests.csproj +++ b/test/Templates.Tests/ExRam.Gremlinq.Templates.Tests.csproj @@ -7,7 +7,7 @@ - + diff --git a/test/Tests.Fixtures/ExRam.Gremlinq.Tests.Fixtures.csproj b/test/Tests.Fixtures/ExRam.Gremlinq.Tests.Fixtures.csproj index d98b8a6e15..e4533ce240 100644 --- a/test/Tests.Fixtures/ExRam.Gremlinq.Tests.Fixtures.csproj +++ b/test/Tests.Fixtures/ExRam.Gremlinq.Tests.Fixtures.csproj @@ -23,9 +23,9 @@ - - - + + + diff --git a/test/Tests.Infrastructure/ExRam.Gremlinq.Tests.Infrastructure.csproj b/test/Tests.Infrastructure/ExRam.Gremlinq.Tests.Infrastructure.csproj index 2967ba38a7..2fcf4843e9 100644 --- a/test/Tests.Infrastructure/ExRam.Gremlinq.Tests.Infrastructure.csproj +++ b/test/Tests.Infrastructure/ExRam.Gremlinq.Tests.Infrastructure.csproj @@ -11,7 +11,7 @@ - + From cb8f122a29e8fb1a3f7d8529fb1dd0c8cde83c67 Mon Sep 17 00:00:00 2001 From: Daniel Weber Date: Tue, 10 Sep 2024 13:16:57 +0200 Subject: [PATCH 2/2] Cleanup Directory.Packages.props. --- Directory.Packages.props | 44 +++++++++++++++++++++------------------- 1 file changed, 23 insertions(+), 21 deletions(-) diff --git a/Directory.Packages.props b/Directory.Packages.props index 12503280b0..14faa2d48e 100644 --- a/Directory.Packages.props +++ b/Directory.Packages.props @@ -1,37 +1,39 @@ + + - + + + + + + + - - + + - - - - - - - + - - - - - - - - - + + + + - - + + + + + + +