From 575892c44f8f0c9362571a20e323686786ff5b2c Mon Sep 17 00:00:00 2001 From: Marko Lahma Date: Thu, 31 Oct 2024 10:12:21 +0200 Subject: [PATCH] Enable CPM transitive pinning and resolve version conflicts (#6069) Co-authored-by: Sipke Schoorstra --- Directory.Packages.props | 15 +++++++-------- build/_build.csproj | 4 ---- src/apps/Elsa.Server.Web/Elsa.Server.Web.csproj | 6 +----- .../Elsa.ServerAndStudio.Web.csproj | 5 ----- src/apps/Elsa.Studio.Web/Elsa.Studio.Web.csproj | 4 ---- .../ElsaStudioWebAssembly.csproj | 4 ---- .../Elsa.Api.Client/Elsa.Api.Client.csproj | 5 ----- .../Elsa.Agents.Core/Elsa.Agents.Core.csproj | 6 +----- .../Elsa.EntityFrameworkCore.Common.csproj | 5 ----- .../Elsa.EntityFrameworkCore.MySql.csproj | 4 ---- .../Elsa.EntityFrameworkCore.PostgreSql.csproj | 4 ---- .../Elsa.EntityFrameworkCore.SqlServer.csproj | 8 -------- .../Elsa.EntityFrameworkCore.Sqlite.csproj | 4 ---- .../Elsa.EntityFrameworkCore.csproj | 5 ----- .../Elsa.FileStorage/Elsa.FileStorage.csproj | 5 ----- src/modules/Elsa.Http/Elsa.Http.csproj | 7 +------ src/modules/Elsa.MongoDb/Elsa.MongoDb.csproj | 5 ----- .../Elsa.ProtoActor.Core.csproj | 4 ---- .../Elsa.Quartz.EntityFrameworkCore.MySql.csproj | 4 ---- ...a.Quartz.EntityFrameworkCore.PostgreSql.csproj | 4 ---- ...sa.Quartz.EntityFrameworkCore.SqlServer.csproj | 7 ------- .../Elsa.Quartz.EntityFrameworkCore.Sqlite.csproj | 5 ----- src/modules/Elsa.Telnyx/Elsa.Telnyx.csproj | 5 ----- .../Elsa.WorkflowProviders.BlobStorage.csproj | 5 ----- .../Elsa.Workflows.Api/Elsa.Workflows.Api.csproj | 6 +----- src/modules/Elsa/Elsa.csproj | 5 ----- .../Elsa.Workflows.PerformanceTests.csproj | 5 ----- 27 files changed, 11 insertions(+), 135 deletions(-) diff --git a/Directory.Packages.props b/Directory.Packages.props index 938266c0a..370b18e6c 100644 --- a/Directory.Packages.props +++ b/Directory.Packages.props @@ -1,7 +1,7 @@ true - false + true @@ -127,17 +127,17 @@ - + - - + + - - + + - + @@ -182,7 +182,6 @@ - diff --git a/build/_build.csproj b/build/_build.csproj index cdb02ddd5..9cb568694 100644 --- a/build/_build.csproj +++ b/build/_build.csproj @@ -24,11 +24,7 @@ - - - - diff --git a/src/apps/Elsa.Server.Web/Elsa.Server.Web.csproj b/src/apps/Elsa.Server.Web/Elsa.Server.Web.csproj index 0cb211fa4..accb12903 100644 --- a/src/apps/Elsa.Server.Web/Elsa.Server.Web.csproj +++ b/src/apps/Elsa.Server.Web/Elsa.Server.Web.csproj @@ -58,13 +58,9 @@ - - - - - + diff --git a/src/apps/Elsa.ServerAndStudio.Web/Elsa.ServerAndStudio.Web.csproj b/src/apps/Elsa.ServerAndStudio.Web/Elsa.ServerAndStudio.Web.csproj index 150e6d3cf..7a9f688cd 100644 --- a/src/apps/Elsa.ServerAndStudio.Web/Elsa.ServerAndStudio.Web.csproj +++ b/src/apps/Elsa.ServerAndStudio.Web/Elsa.ServerAndStudio.Web.csproj @@ -48,9 +48,4 @@ - - - - - \ No newline at end of file diff --git a/src/apps/Elsa.Studio.Web/Elsa.Studio.Web.csproj b/src/apps/Elsa.Studio.Web/Elsa.Studio.Web.csproj index ca1886c1f..20f8481e7 100644 --- a/src/apps/Elsa.Studio.Web/Elsa.Studio.Web.csproj +++ b/src/apps/Elsa.Studio.Web/Elsa.Studio.Web.csproj @@ -15,10 +15,6 @@ - - - - diff --git a/src/apps/ElsaStudioWebAssembly/ElsaStudioWebAssembly.csproj b/src/apps/ElsaStudioWebAssembly/ElsaStudioWebAssembly.csproj index 077851b53..9e93808f4 100644 --- a/src/apps/ElsaStudioWebAssembly/ElsaStudioWebAssembly.csproj +++ b/src/apps/ElsaStudioWebAssembly/ElsaStudioWebAssembly.csproj @@ -14,8 +14,4 @@ - - - - diff --git a/src/clients/Elsa.Api.Client/Elsa.Api.Client.csproj b/src/clients/Elsa.Api.Client/Elsa.Api.Client.csproj index bd58f9fc6..f8246f150 100644 --- a/src/clients/Elsa.Api.Client/Elsa.Api.Client.csproj +++ b/src/clients/Elsa.Api.Client/Elsa.Api.Client.csproj @@ -16,10 +16,5 @@ - - - - - diff --git a/src/modules/Elsa.Agents.Core/Elsa.Agents.Core.csproj b/src/modules/Elsa.Agents.Core/Elsa.Agents.Core.csproj index 66581f0c1..da202e15f 100644 --- a/src/modules/Elsa.Agents.Core/Elsa.Agents.Core.csproj +++ b/src/modules/Elsa.Agents.Core/Elsa.Agents.Core.csproj @@ -17,9 +17,5 @@ - - - - - + diff --git a/src/modules/Elsa.EntityFrameworkCore.Common/Elsa.EntityFrameworkCore.Common.csproj b/src/modules/Elsa.EntityFrameworkCore.Common/Elsa.EntityFrameworkCore.Common.csproj index 7c23bc98b..723566266 100644 --- a/src/modules/Elsa.EntityFrameworkCore.Common/Elsa.EntityFrameworkCore.Common.csproj +++ b/src/modules/Elsa.EntityFrameworkCore.Common/Elsa.EntityFrameworkCore.Common.csproj @@ -18,11 +18,6 @@ - - - - - diff --git a/src/modules/Elsa.EntityFrameworkCore.MySql/Elsa.EntityFrameworkCore.MySql.csproj b/src/modules/Elsa.EntityFrameworkCore.MySql/Elsa.EntityFrameworkCore.MySql.csproj index 7945447f3..c00d3b8d7 100644 --- a/src/modules/Elsa.EntityFrameworkCore.MySql/Elsa.EntityFrameworkCore.MySql.csproj +++ b/src/modules/Elsa.EntityFrameworkCore.MySql/Elsa.EntityFrameworkCore.MySql.csproj @@ -12,10 +12,6 @@ - - - - diff --git a/src/modules/Elsa.EntityFrameworkCore.PostgreSql/Elsa.EntityFrameworkCore.PostgreSql.csproj b/src/modules/Elsa.EntityFrameworkCore.PostgreSql/Elsa.EntityFrameworkCore.PostgreSql.csproj index f3216e047..e0f1c22ec 100644 --- a/src/modules/Elsa.EntityFrameworkCore.PostgreSql/Elsa.EntityFrameworkCore.PostgreSql.csproj +++ b/src/modules/Elsa.EntityFrameworkCore.PostgreSql/Elsa.EntityFrameworkCore.PostgreSql.csproj @@ -12,10 +12,6 @@ - - - - diff --git a/src/modules/Elsa.EntityFrameworkCore.SqlServer/Elsa.EntityFrameworkCore.SqlServer.csproj b/src/modules/Elsa.EntityFrameworkCore.SqlServer/Elsa.EntityFrameworkCore.SqlServer.csproj index b2b5b5804..6ef2fdb1e 100644 --- a/src/modules/Elsa.EntityFrameworkCore.SqlServer/Elsa.EntityFrameworkCore.SqlServer.csproj +++ b/src/modules/Elsa.EntityFrameworkCore.SqlServer/Elsa.EntityFrameworkCore.SqlServer.csproj @@ -16,12 +16,4 @@ - - - - - - - - \ No newline at end of file diff --git a/src/modules/Elsa.EntityFrameworkCore.Sqlite/Elsa.EntityFrameworkCore.Sqlite.csproj b/src/modules/Elsa.EntityFrameworkCore.Sqlite/Elsa.EntityFrameworkCore.Sqlite.csproj index aedd72175..7b7edfa04 100644 --- a/src/modules/Elsa.EntityFrameworkCore.Sqlite/Elsa.EntityFrameworkCore.Sqlite.csproj +++ b/src/modules/Elsa.EntityFrameworkCore.Sqlite/Elsa.EntityFrameworkCore.Sqlite.csproj @@ -13,10 +13,6 @@ - - - - diff --git a/src/modules/Elsa.EntityFrameworkCore/Elsa.EntityFrameworkCore.csproj b/src/modules/Elsa.EntityFrameworkCore/Elsa.EntityFrameworkCore.csproj index e7cb2e4f1..8a9b1901e 100644 --- a/src/modules/Elsa.EntityFrameworkCore/Elsa.EntityFrameworkCore.csproj +++ b/src/modules/Elsa.EntityFrameworkCore/Elsa.EntityFrameworkCore.csproj @@ -11,11 +11,6 @@ - - - - - diff --git a/src/modules/Elsa.FileStorage/Elsa.FileStorage.csproj b/src/modules/Elsa.FileStorage/Elsa.FileStorage.csproj index 432926232..f043d374f 100644 --- a/src/modules/Elsa.FileStorage/Elsa.FileStorage.csproj +++ b/src/modules/Elsa.FileStorage/Elsa.FileStorage.csproj @@ -15,11 +15,6 @@ - - - - - diff --git a/src/modules/Elsa.Http/Elsa.Http.csproj b/src/modules/Elsa.Http/Elsa.Http.csproj index 4c5dea68e..9f1f9fda3 100644 --- a/src/modules/Elsa.Http/Elsa.Http.csproj +++ b/src/modules/Elsa.Http/Elsa.Http.csproj @@ -10,11 +10,6 @@ - - - - - @@ -25,5 +20,5 @@ - + diff --git a/src/modules/Elsa.MongoDb/Elsa.MongoDb.csproj b/src/modules/Elsa.MongoDb/Elsa.MongoDb.csproj index d19673d26..c9bea94ea 100644 --- a/src/modules/Elsa.MongoDb/Elsa.MongoDb.csproj +++ b/src/modules/Elsa.MongoDb/Elsa.MongoDb.csproj @@ -17,11 +17,6 @@ - - - - - diff --git a/src/modules/Elsa.ProtoActor.Core/Elsa.ProtoActor.Core.csproj b/src/modules/Elsa.ProtoActor.Core/Elsa.ProtoActor.Core.csproj index c26154557..9dd028b64 100644 --- a/src/modules/Elsa.ProtoActor.Core/Elsa.ProtoActor.Core.csproj +++ b/src/modules/Elsa.ProtoActor.Core/Elsa.ProtoActor.Core.csproj @@ -27,8 +27,4 @@ - - - - diff --git a/src/modules/Elsa.Quartz.EntityFrameworkCore.MySql/Elsa.Quartz.EntityFrameworkCore.MySql.csproj b/src/modules/Elsa.Quartz.EntityFrameworkCore.MySql/Elsa.Quartz.EntityFrameworkCore.MySql.csproj index 145a64880..20bb854d8 100644 --- a/src/modules/Elsa.Quartz.EntityFrameworkCore.MySql/Elsa.Quartz.EntityFrameworkCore.MySql.csproj +++ b/src/modules/Elsa.Quartz.EntityFrameworkCore.MySql/Elsa.Quartz.EntityFrameworkCore.MySql.csproj @@ -13,10 +13,6 @@ - - - - diff --git a/src/modules/Elsa.Quartz.EntityFrameworkCore.PostgreSql/Elsa.Quartz.EntityFrameworkCore.PostgreSql.csproj b/src/modules/Elsa.Quartz.EntityFrameworkCore.PostgreSql/Elsa.Quartz.EntityFrameworkCore.PostgreSql.csproj index 8f6d2c9c6..43788dd8e 100644 --- a/src/modules/Elsa.Quartz.EntityFrameworkCore.PostgreSql/Elsa.Quartz.EntityFrameworkCore.PostgreSql.csproj +++ b/src/modules/Elsa.Quartz.EntityFrameworkCore.PostgreSql/Elsa.Quartz.EntityFrameworkCore.PostgreSql.csproj @@ -15,10 +15,6 @@ - - - - diff --git a/src/modules/Elsa.Quartz.EntityFrameworkCore.SqlServer/Elsa.Quartz.EntityFrameworkCore.SqlServer.csproj b/src/modules/Elsa.Quartz.EntityFrameworkCore.SqlServer/Elsa.Quartz.EntityFrameworkCore.SqlServer.csproj index c6ede3ade..ecbf91824 100644 --- a/src/modules/Elsa.Quartz.EntityFrameworkCore.SqlServer/Elsa.Quartz.EntityFrameworkCore.SqlServer.csproj +++ b/src/modules/Elsa.Quartz.EntityFrameworkCore.SqlServer/Elsa.Quartz.EntityFrameworkCore.SqlServer.csproj @@ -19,11 +19,4 @@ - - - - - - - \ No newline at end of file diff --git a/src/modules/Elsa.Quartz.EntityFrameworkCore.Sqlite/Elsa.Quartz.EntityFrameworkCore.Sqlite.csproj b/src/modules/Elsa.Quartz.EntityFrameworkCore.Sqlite/Elsa.Quartz.EntityFrameworkCore.Sqlite.csproj index 1a5ad7e07..63abad7b2 100644 --- a/src/modules/Elsa.Quartz.EntityFrameworkCore.Sqlite/Elsa.Quartz.EntityFrameworkCore.Sqlite.csproj +++ b/src/modules/Elsa.Quartz.EntityFrameworkCore.Sqlite/Elsa.Quartz.EntityFrameworkCore.Sqlite.csproj @@ -13,11 +13,6 @@ - - - - - diff --git a/src/modules/Elsa.Telnyx/Elsa.Telnyx.csproj b/src/modules/Elsa.Telnyx/Elsa.Telnyx.csproj index a3c269bb2..9633deb6c 100644 --- a/src/modules/Elsa.Telnyx/Elsa.Telnyx.csproj +++ b/src/modules/Elsa.Telnyx/Elsa.Telnyx.csproj @@ -22,9 +22,4 @@ - - - - - diff --git a/src/modules/Elsa.WorkflowProviders.BlobStorage/Elsa.WorkflowProviders.BlobStorage.csproj b/src/modules/Elsa.WorkflowProviders.BlobStorage/Elsa.WorkflowProviders.BlobStorage.csproj index ab9102873..3ac581466 100644 --- a/src/modules/Elsa.WorkflowProviders.BlobStorage/Elsa.WorkflowProviders.BlobStorage.csproj +++ b/src/modules/Elsa.WorkflowProviders.BlobStorage/Elsa.WorkflowProviders.BlobStorage.csproj @@ -15,9 +15,4 @@ - - - - - diff --git a/src/modules/Elsa.Workflows.Api/Elsa.Workflows.Api.csproj b/src/modules/Elsa.Workflows.Api/Elsa.Workflows.Api.csproj index c41a9e2d3..4fff95dc9 100644 --- a/src/modules/Elsa.Workflows.Api/Elsa.Workflows.Api.csproj +++ b/src/modules/Elsa.Workflows.Api/Elsa.Workflows.Api.csproj @@ -14,9 +14,5 @@ - - - - - + diff --git a/src/modules/Elsa/Elsa.csproj b/src/modules/Elsa/Elsa.csproj index e01e40b2d..08ccd9fb7 100644 --- a/src/modules/Elsa/Elsa.csproj +++ b/src/modules/Elsa/Elsa.csproj @@ -21,9 +21,4 @@ - - - - - diff --git a/test/performance/Elsa.Workflows.PerformanceTests/Elsa.Workflows.PerformanceTests.csproj b/test/performance/Elsa.Workflows.PerformanceTests/Elsa.Workflows.PerformanceTests.csproj index 1e3f7d0e6..c0dea99e4 100644 --- a/test/performance/Elsa.Workflows.PerformanceTests/Elsa.Workflows.PerformanceTests.csproj +++ b/test/performance/Elsa.Workflows.PerformanceTests/Elsa.Workflows.PerformanceTests.csproj @@ -13,9 +13,4 @@ - - - - -