Skip to content

Commit 388e5f9

Browse files
lauranetoCopilot
andauthored
Dependencies: Fixed dependency conflicts when installing Microsoft.EntityFrameworkCore.Design (closes #17839) (#20480)
* Add explicit references to Microsoft.CodeAnalysis.* packages to fix conflicts when installing Microsoft.EntityFrameworkCore.Design * Disable CPM for UI project to better reflect consumers * Update src/Umbraco.Infrastructure/Umbraco.Infrastructure.csproj Co-authored-by: Copilot <[email protected]> --------- Co-authored-by: Copilot <[email protected]>
1 parent d20cdd4 commit 388e5f9

File tree

3 files changed

+9
-3
lines changed

3 files changed

+9
-3
lines changed

Directory.Packages.props

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,11 @@
1515
<PackageVersion Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="8.0.11" />
1616
<PackageVersion Include="Microsoft.AspNetCore.Mvc.Razor.RuntimeCompilation" Version="8.0.11" />
1717
<PackageVersion Include="Microsoft.CodeAnalysis.CSharp" Version="4.10.0" />
18+
<PackageVersion Include="Microsoft.CodeAnalysis.CSharp.Workspaces" Version="4.10.0" />
19+
<PackageVersion Include="Microsoft.CodeAnalysis.Workspaces.MSBuild" Version="4.10.0" />
1820
<PackageVersion Include="Microsoft.Data.Sqlite" Version="8.0.11" />
1921
<PackageVersion Include="Microsoft.EntityFrameworkCore.Sqlite" Version="8.0.11" />
2022
<PackageVersion Include="Microsoft.EntityFrameworkCore.SqlServer" Version="8.0.11" />
21-
<PackageVersion Include="Microsoft.EntityFrameworkCore.Design" Version="8.0.11" />
2223
<PackageVersion Include="Microsoft.Extensions.Caching.Abstractions" Version="8.0.0" />
2324
<PackageVersion Include="Microsoft.Extensions.Configuration.Abstractions" Version="8.0.0" />
2425
<PackageVersion Include="Microsoft.Extensions.Configuration.Json" Version="8.0.0" />

src/Umbraco.Infrastructure/Umbraco.Infrastructure.csproj

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,10 @@
4343

4444
<!-- Both Dazinator.Extensions.FileProviders and MiniProfiler.AspNetCore.Mvc bring in a vulnerable version of System.Text.RegularExpressions -->
4545
<PackageReference Include="System.Text.RegularExpressions" />
46+
47+
<!-- Take top-level dependency on these Microsoft.CodeAnalysis.* packages due to conflicts when installing Microsoft.EntityFrameworkCore.Design -->
48+
<PackageReference Include="Microsoft.CodeAnalysis.CSharp.Workspaces" />
49+
<PackageReference Include="Microsoft.CodeAnalysis.Workspaces.MSBuild" />
4650
</ItemGroup>
4751

4852
<ItemGroup>

src/Umbraco.Web.UI/Umbraco.Web.UI.csproj

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
<RootNamespace>Umbraco.Cms.Web.UI</RootNamespace>
44
<IsPackable>false</IsPackable>
55
<EnablePackageValidation>false</EnablePackageValidation>
6+
<ManagePackageVersionsCentrally>false</ManagePackageVersionsCentrally>
67
</PropertyGroup>
78

89
<Import Project="..\Umbraco.Cms.Targets\buildTransitive\Umbraco.Cms.Targets.props" />
@@ -13,13 +14,13 @@
1314

1415
<ItemGroup>
1516
<!-- Add design/build time support for EF Core migrations -->
16-
<PackageReference Include="Microsoft.EntityFrameworkCore.Design" PrivateAssets="all" />
17+
<PackageReference Include="Microsoft.EntityFrameworkCore.Design" PrivateAssets="all" Version="8.0.11" />
1718
</ItemGroup>
1819

1920
<ItemGroup>
2021
<!-- Ensure the AppLocalIcu setting is the same as the referenced ICU package version and changes are also done to the template project! -->
2122
<!-- Opt-in to app-local ICU to ensure consistent globalization APIs across different platforms -->
22-
<PackageReference Include="Microsoft.ICU.ICU4C.Runtime" VersionOverride="72.1.0.3" />
23+
<PackageReference Include="Microsoft.ICU.ICU4C.Runtime" Version="72.1.0.3" />
2324
<RuntimeHostConfigurationOption Include="System.Globalization.AppLocalIcu" Value="72.1.0.3" Condition="$(RuntimeIdentifier.StartsWith('linux')) or $(RuntimeIdentifier.StartsWith('win')) or ('$(RuntimeIdentifier)' == '' and !$([MSBuild]::IsOSPlatform('osx')))" />
2425
</ItemGroup>
2526

0 commit comments

Comments
 (0)