Enable CPM transitive pinning and resolve version conflicts (#6069)

Co-authored-by: Sipke Schoorstra <sipkeschoorstra@outlook.com>
2024-10-31 10:12:21 +02:00 · 2024-10-31 10:12:21 +02:00 · 575892c44f
parent 4acde73dad
commit 575892c44f
27 changed files with 11 additions and 135 deletions
--- a/Directory.Packages.props
+++ b/Directory.Packages.props
@ -1,7 +1,7 @@
 <Project>
  <PropertyGroup>
    <ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
-    <CentralPackageTransitivePinningEnabled>false</CentralPackageTransitivePinningEnabled>
+    <CentralPackageTransitivePinningEnabled>true</CentralPackageTransitivePinningEnabled>
  </PropertyGroup>
  <ItemGroup>
    <PackageVersion Include="Antlr4.Runtime.Standard" Version="4.13.1" />
@ -127,17 +127,17 @@
    <PackageVersion Include="Microsoft.EntityFrameworkCore.SqlServer" Version="7.0.20" />
    <PackageVersion Include="Microsoft.Extensions.Caching.Abstractions" Version="7.0.0" />
    <PackageVersion Include="Microsoft.Extensions.Caching.Memory" Version="7.0.0" />
-    <PackageVersion Include="Microsoft.Extensions.Configuration.Abstractions" Version="7.0.0" />
+    <PackageVersion Include="Microsoft.Extensions.Configuration.Abstractions" Version="8.0.0" />
    <PackageVersion Include="Microsoft.Extensions.Configuration" Version="7.0.0" />
-    <PackageVersion Include="Microsoft.Extensions.DependencyInjection" Version="7.0.0" />
-    <PackageVersion Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="7.0.0" />
+    <PackageVersion Include="Microsoft.Extensions.DependencyInjection" Version="8.0.1" />
+    <PackageVersion Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="8.0.2" />
    <PackageVersion Include="Microsoft.Extensions.Hosting.Abstractions" Version="7.0.0" />
    <PackageVersion Include="Microsoft.Extensions.Http" Version="7.0.0" />
    <PackageVersion Include="Microsoft.Extensions.Http.Polly" Version="7.0.20" />
-    <PackageVersion Include="Microsoft.Extensions.Logging" Version="7.0.0" />
-    <PackageVersion Include="Microsoft.Extensions.Logging.Abstractions" Version="7.0.1" />
+    <PackageVersion Include="Microsoft.Extensions.Logging" Version="8.0.0" />
+    <PackageVersion Include="Microsoft.Extensions.Logging.Abstractions" Version="8.0.1" />
    <PackageVersion Include="Microsoft.Extensions.Logging.Console" Version="7.0.0" />
-    <PackageVersion Include="Microsoft.Extensions.Options" Version="7.0.1" />
+    <PackageVersion Include="Microsoft.Extensions.Options" Version="8.0.0" />
    <PackageVersion Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="7.0.0" />
    <PackageVersion Include="Npgsql" Version="7.0.8" />
    <PackageVersion Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="7.0.18" />
@ -182,7 +182,6 @@
    <PackageVersion Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="8.0.10" />
    <PackageVersion Include="Polly" Version="8.4.2" />
    <PackageVersion Include="Pomelo.EntityFrameworkCore.MySql" Version="8.0.2" />
-    <PackageVersion Include="Microsoft.Extensions.DependencyModel" Version="8.0.2" />
    <PackageVersion Include="Refit" Version="7.2.1" />
    <PackageVersion Include="Refit.HttpClientFactory" Version="7.2.1" />
    <PackageVersion Include="Scrutor" Version="5.0.1" />
--- a/build/_build.csproj
+++ b/build/_build.csproj
@ -24,11 +24,7 @@

  <!--Overridden for vulnerability reasons with dependencies referencing older versions.-->
  <ItemGroup>
-    <PackageReference Include="Azure.Identity" Version="1.13.1" />
-    <PackageReference Include="NuGet.Packaging" Version="6.11.1" />
    <PackageReference Include="System.Formats.Asn1" Version="8.0.1" />
-    <PackageReference Include="System.Text.Json" Version="8.0.5" />
-    <PackageReference Include="Microsoft.Identity.Client" VersionOverride="4.66.1" />
  </ItemGroup>

 </Project>
--- a/src/apps/Elsa.Server.Web/Elsa.Server.Web.csproj
+++ b/src/apps/Elsa.Server.Web/Elsa.Server.Web.csproj
@ -58,13 +58,9 @@
        <PackageReference Include="Proto.Persistence.Sqlite"/>
        <PackageReference Include="Proto.Persistence.SqlServer"/>
    </ItemGroup>
-    
-    <!--Overridden for vulnaribility reasons with dependencies referencing older versions.-->
-    <ItemGroup Label="Overrides">
-        <PackageReference Include="System.Text.Json" VersionOverride="$(SystemTextJsonVersion)" />
-    </ItemGroup>

    <ItemGroup>
      <Folder Include="App_Data\" />
    </ItemGroup>
+
 </Project>
--- a/src/apps/Elsa.ServerAndStudio.Web/Elsa.ServerAndStudio.Web.csproj
+++ b/src/apps/Elsa.ServerAndStudio.Web/Elsa.ServerAndStudio.Web.csproj
@ -48,9 +48,4 @@
        <PackageReference Include="Elsa.Studio.Login.BlazorWasm"/>
    </ItemGroup>

-    <!--Overridden for vulnaribility reasons with dependencies referencing older versions.-->
-    <ItemGroup>
-        <PackageReference Include="System.Text.Json" VersionOverride="$(SystemTextJsonVersion)" />
-    </ItemGroup>
-
 </Project>
--- a/src/apps/Elsa.Studio.Web/Elsa.Studio.Web.csproj
+++ b/src/apps/Elsa.Studio.Web/Elsa.Studio.Web.csproj
@ -15,10 +15,6 @@
        <PackageReference Include="Elsa.Studio.Login.BlazorWasm" />
        <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.Server" />
    </ItemGroup>
-    
-    <ItemGroup>
-        <PackageReference Include="System.Text.Json" VersionOverride="$(SystemTextJsonVersion)" />
-    </ItemGroup>

    <ItemGroup>
        <Folder Include="wwwroot\" />
--- a/src/apps/ElsaStudioWebAssembly/ElsaStudioWebAssembly.csproj
+++ b/src/apps/ElsaStudioWebAssembly/ElsaStudioWebAssembly.csproj
@ -14,8 +14,4 @@
        <PackageReference Include="Microsoft.Extensions.Http" />
    </ItemGroup>

-    <ItemGroup>
-        <PackageReference Include="System.Text.Json" VersionOverride="$(SystemTextJsonVersion)" />
-    </ItemGroup>
-
 </Project>
--- a/src/clients/Elsa.Api.Client/Elsa.Api.Client.csproj
+++ b/src/clients/Elsa.Api.Client/Elsa.Api.Client.csproj
@ -16,10 +16,5 @@
        <PackageReference Include="Refit" />
        <PackageReference Include="Refit.HttpClientFactory" />
    </ItemGroup>
-    
-    <!--Overridden for vulnerability reasons with dependencies referencing older versions.-->
-    <ItemGroup>
-        <PackageReference Include="System.Text.Json" VersionOverride="$(SystemTextJsonVersion)" />
-    </ItemGroup>

 </Project>
--- a/src/modules/Elsa.Agents.Core/Elsa.Agents.Core.csproj
+++ b/src/modules/Elsa.Agents.Core/Elsa.Agents.Core.csproj
@ -17,9 +17,5 @@
      <ProjectReference Include="..\Elsa.Agents.Models\Elsa.Agents.Models.csproj" />
      <ProjectReference Include="..\Elsa.Common\Elsa.Common.csproj" />
    </ItemGroup>
-    
-    <ItemGroup>
-        <PackageReference Include="System.Text.Json" VersionOverride="$(SystemTextJsonVersion)" />
-    </ItemGroup>
-    
+
 </Project>
--- a/src/modules/Elsa.EntityFrameworkCore.Common/Elsa.EntityFrameworkCore.Common.csproj
+++ b/src/modules/Elsa.EntityFrameworkCore.Common/Elsa.EntityFrameworkCore.Common.csproj
@ -18,11 +18,6 @@
        <PackageReference Include="System.CommandLine" />
    </ItemGroup>

-    <!--Overridden for vulnerability reasons with dependencies referencing older versions.-->
-    <ItemGroup>
-        <PackageReference Include="System.Text.Json" VersionOverride="$(SystemTextJsonVersion)" />
-    </ItemGroup>
-
    <ItemGroup>
        <ProjectReference Include="..\Elsa.Common\Elsa.Common.csproj" />
        <ProjectReference Include="..\Elsa.Tenants\Elsa.Tenants.csproj" />
--- a/src/modules/Elsa.EntityFrameworkCore.MySql/Elsa.EntityFrameworkCore.MySql.csproj
+++ b/src/modules/Elsa.EntityFrameworkCore.MySql/Elsa.EntityFrameworkCore.MySql.csproj
@ -12,10 +12,6 @@
        <PackageReference Include="Pomelo.EntityFrameworkCore.MySql" />
    </ItemGroup>

-    <ItemGroup>
-        <PackageReference Include="System.Text.Json" VersionOverride="$(SystemTextJsonVersion)" />
-    </ItemGroup>
-    
    <ItemGroup>
        <ProjectReference Include="..\Elsa.EntityFrameworkCore\Elsa.EntityFrameworkCore.csproj" />
    </ItemGroup>
--- a/src/modules/Elsa.EntityFrameworkCore.PostgreSql/Elsa.EntityFrameworkCore.PostgreSql.csproj
+++ b/src/modules/Elsa.EntityFrameworkCore.PostgreSql/Elsa.EntityFrameworkCore.PostgreSql.csproj
@ -12,10 +12,6 @@
        <PackageReference Include="Microsoft.EntityFrameworkCore.Design" PrivateAssets="all" />
    </ItemGroup>

-    <ItemGroup>
-        <PackageReference Include="System.Text.Json" VersionOverride="$(SystemTextJsonVersion)" />
-    </ItemGroup>
-    
    <ItemGroup>
        <ProjectReference Include="..\Elsa.EntityFrameworkCore\Elsa.EntityFrameworkCore.csproj" />
    </ItemGroup>
--- a/src/modules/Elsa.EntityFrameworkCore.SqlServer/Elsa.EntityFrameworkCore.SqlServer.csproj
+++ b/src/modules/Elsa.EntityFrameworkCore.SqlServer/Elsa.EntityFrameworkCore.SqlServer.csproj
@ -16,12 +16,4 @@
        <ProjectReference Include="..\Elsa.EntityFrameworkCore\Elsa.EntityFrameworkCore.csproj" />
    </ItemGroup>

-    <!--Overridden for vulnerability reasons with dependencies referencing older versions.-->
-    <ItemGroup>
-        <PackageReference Include="Azure.Identity" VersionOverride="1.11.4" />
-        <PackageReference Include="Microsoft.Identity.Client" VersionOverride="4.61.3" />
-        <PackageReference Include="System.Formats.Asn1" VersionOverride="8.0.1" />
-        <PackageReference Include="System.Text.Json" VersionOverride="$(SystemTextJsonVersion)" />
-    </ItemGroup>
-
 </Project>
--- a/src/modules/Elsa.EntityFrameworkCore.Sqlite/Elsa.EntityFrameworkCore.Sqlite.csproj
+++ b/src/modules/Elsa.EntityFrameworkCore.Sqlite/Elsa.EntityFrameworkCore.Sqlite.csproj
@ -13,10 +13,6 @@
        <PackageReference Include="Microsoft.EntityFrameworkCore.Design" PrivateAssets="all" />
    </ItemGroup>

-    <ItemGroup>
-        <PackageReference Include="System.Text.Json" VersionOverride="$(SystemTextJsonVersion)" />
-    </ItemGroup>
-
    <ItemGroup>
        <ProjectReference Include="..\Elsa.EntityFrameworkCore\Elsa.EntityFrameworkCore.csproj" />
    </ItemGroup>
--- a/src/modules/Elsa.EntityFrameworkCore/Elsa.EntityFrameworkCore.csproj
+++ b/src/modules/Elsa.EntityFrameworkCore/Elsa.EntityFrameworkCore.csproj
@ -11,11 +11,6 @@
        <PackageReference Include="Microsoft.Extensions.Hosting.Abstractions" />
    </ItemGroup>

-    <!--Overridden for vulnerability reasons with dependencies referencing older versions.-->
-    <ItemGroup>
-        <PackageReference Include="System.Text.Json" VersionOverride="$(SystemTextJsonVersion)" />
-    </ItemGroup>
-    
    <ItemGroup>
        <ProjectReference Include="..\Elsa.Alterations.Core\Elsa.Alterations.Core.csproj" />
        <ProjectReference Include="..\Elsa.Alterations\Elsa.Alterations.csproj" />
--- a/src/modules/Elsa.FileStorage/Elsa.FileStorage.csproj
+++ b/src/modules/Elsa.FileStorage/Elsa.FileStorage.csproj
@ -15,11 +15,6 @@
        <PackageReference Include="FluentStorage" />
    </ItemGroup>

-    <!--Overridden for vulnerability reasons with dependencies referencing older versions.-->
-    <ItemGroup>
-        <PackageReference Include="System.Text.Json" VersionOverride="$(SystemTextJsonVersion)" />
-    </ItemGroup>
-
    <ItemGroup>
      <ProjectReference Include="..\Elsa.Workflows.Core\Elsa.Workflows.Core.csproj" />
      <ProjectReference Include="..\Elsa.Workflows.Management\Elsa.Workflows.Management.csproj" />
--- a/src/modules/Elsa.Http/Elsa.Http.csproj
+++ b/src/modules/Elsa.Http/Elsa.Http.csproj
@ -10,11 +10,6 @@
    <ItemGroup>
        <PackageReference Include="FluentStorage" />
    </ItemGroup>
-    
-    <!--Overridden for vulnerability reasons with dependencies referencing older versions.-->
-    <ItemGroup>
-        <PackageReference Include="System.Text.Json" VersionOverride="$(SystemTextJsonVersion)" />
-    </ItemGroup>

    <ItemGroup>
        <ProjectReference Include="..\Elsa.Liquid\Elsa.Liquid.csproj" />
@ -25,5 +20,5 @@
        <ProjectReference Include="..\Elsa.Workflows.Runtime\Elsa.Workflows.Runtime.csproj" />
        <ProjectReference Include="..\Elsa.JavaScript\Elsa.JavaScript.csproj" />
    </ItemGroup>
-    
+
 </Project>
--- a/src/modules/Elsa.MongoDb/Elsa.MongoDb.csproj
+++ b/src/modules/Elsa.MongoDb/Elsa.MongoDb.csproj
@ -17,11 +17,6 @@
        <PackageReference Include="MongoDB.Driver.Extensions"/>
    </ItemGroup>

-    <!--Overridden for vulnaribility reasons with dependencies referencing older versions.-->
-    <ItemGroup>
-        <PackageReference Include="System.Text.Json" VersionOverride="$(SystemTextJsonVersion)"/>
-    </ItemGroup>
-
    <ItemGroup>
        <ProjectReference Include="..\..\common\Elsa.Features\Elsa.Features.csproj"/>
        <ProjectReference Include="..\Elsa.Alterations.Core\Elsa.Alterations.Core.csproj"/>
--- a/src/modules/Elsa.ProtoActor.Core/Elsa.ProtoActor.Core.csproj
+++ b/src/modules/Elsa.ProtoActor.Core/Elsa.ProtoActor.Core.csproj
@ -27,8 +27,4 @@
      <ProjectReference Include="..\Elsa.Workflows.Core\Elsa.Workflows.Core.csproj" />
    </ItemGroup>

-    <ItemGroup>
-        <PackageReference Include="System.Text.Json" VersionOverride="$(SystemTextJsonVersion)" />
-    </ItemGroup>
-    
 </Project>
--- 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 @@
        <PackageReference Include="Microsoft.EntityFrameworkCore.Design" PrivateAssets="all" />
        <PackageReference Include="Quartz.Serialization.Json" />
    </ItemGroup>
-    
-    <ItemGroup>
-        <PackageReference Include="System.Text.Json" VersionOverride="$(SystemTextJsonVersion)" />
-    </ItemGroup>

    <ItemGroup>
        <ProjectReference Include="..\Elsa.EntityFrameworkCore.Common\Elsa.EntityFrameworkCore.Common.csproj" />
--- 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 @@
        <PackageReference Include="Quartz.Serialization.Json" />
    </ItemGroup>

-    <ItemGroup>
-        <PackageReference Include="System.Text.Json" VersionOverride="$(SystemTextJsonVersion)" />
-    </ItemGroup>
-
    <ItemGroup>
        <ProjectReference Include="..\Elsa.EntityFrameworkCore.Common\Elsa.EntityFrameworkCore.Common.csproj" />
        <ProjectReference Include="..\Elsa.Quartz\Elsa.Quartz.csproj" />
--- 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 @@
        <ProjectReference Include="..\Elsa.Quartz\Elsa.Quartz.csproj" />
    </ItemGroup>

-    <!--Overridden for vulnerability reasons with dependencies referencing older versions.-->
-    <ItemGroup>
-        <PackageReference Include="Azure.Identity" VersionOverride="1.11.4" />
-        <PackageReference Include="Microsoft.Identity.Client" VersionOverride="4.61.3" />
-        <PackageReference Include="System.Formats.Asn1" VersionOverride="8.0.1" />
-        <PackageReference Include="System.Text.Json" VersionOverride="$(SystemTextJsonVersion)" />
-    </ItemGroup>
 </Project>
--- 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 @@
        <PackageReference Include="Microsoft.EntityFrameworkCore.Design" PrivateAssets="all" />
        <PackageReference Include="Quartz.Serialization.Json" />
    </ItemGroup>
-    
-    <!--Overridden for vulnaribility reasons with dependencies referencing older versions.-->
-    <ItemGroup>
-        <PackageReference Include="System.Text.Json" VersionOverride="$(SystemTextJsonVersion)" />
-    </ItemGroup>

    <ItemGroup>
        <ProjectReference Include="..\Elsa.EntityFrameworkCore.Common\Elsa.EntityFrameworkCore.Common.csproj" />
--- a/src/modules/Elsa.Telnyx/Elsa.Telnyx.csproj
+++ b/src/modules/Elsa.Telnyx/Elsa.Telnyx.csproj
@ -22,9 +22,4 @@
        <ProjectReference Include="..\Elsa.Workflows.Runtime\Elsa.Workflows.Runtime.csproj" />
    </ItemGroup>

-    <!--Overridden for vulnerability reasons with dependencies referencing older versions.-->
-    <ItemGroup>
-        <PackageReference Include="System.Text.Json" VersionOverride="$(SystemTextJsonVersion)" />
-    </ItemGroup>
-
 </Project>
--- a/src/modules/Elsa.WorkflowProviders.BlobStorage/Elsa.WorkflowProviders.BlobStorage.csproj
+++ b/src/modules/Elsa.WorkflowProviders.BlobStorage/Elsa.WorkflowProviders.BlobStorage.csproj
@ -15,9 +15,4 @@
      <PackageReference Include="FluentStorage" />
    </ItemGroup>

-    <!--Overridden for vulnerability reasons with dependencies referencing older versions.-->
-    <ItemGroup>
-        <PackageReference Include="System.Text.Json" VersionOverride="$(SystemTextJsonVersion)" />
-    </ItemGroup>
-
 </Project>
--- a/src/modules/Elsa.Workflows.Api/Elsa.Workflows.Api.csproj
+++ b/src/modules/Elsa.Workflows.Api/Elsa.Workflows.Api.csproj
@ -14,9 +14,5 @@
        <ProjectReference Include="..\Elsa.Workflows.Management\Elsa.Workflows.Management.csproj" />
        <ProjectReference Include="..\Elsa.Workflows.Runtime\Elsa.Workflows.Runtime.csproj" />
    </ItemGroup>
-    
-    <!--Overridden for vulnaribility reasons with dependencies referencing older versions.-->
-    <ItemGroup>
-        <PackageReference Include="System.Text.Json" VersionOverride="$(SystemTextJsonVersion)" />
-    </ItemGroup>
+
 </Project>
--- a/src/modules/Elsa/Elsa.csproj
+++ b/src/modules/Elsa/Elsa.csproj
@ -21,9 +21,4 @@
        <ProjectReference Include="..\..\modules\Elsa.Workflows.Runtime\Elsa.Workflows.Runtime.csproj" />
    </ItemGroup>

-    <!--Overridden for vulnerability reasons with dependencies referencing older versions.-->
-    <ItemGroup>
-        <PackageReference Include="System.Text.Json" VersionOverride="$(SystemTextJsonVersion)" />
-    </ItemGroup>
-
 </Project>
--- a/test/performance/Elsa.Workflows.PerformanceTests/Elsa.Workflows.PerformanceTests.csproj
+++ b/test/performance/Elsa.Workflows.PerformanceTests/Elsa.Workflows.PerformanceTests.csproj
@ -13,9 +13,4 @@
        <Using Include="Xunit"/>
    </ItemGroup>

-    <!--Overridden for vulnaribility reasons with dependencies referencing older versions.-->
-    <ItemGroup>
-        <PackageReference Include="System.Text.Json" VersionOverride="$(SystemTextJsonVersion)" />
-    </ItemGroup>
-
 </Project>