Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

reorganized dependencies into separate paths for .NET Standard, .NET 6/8+ #7453

Merged
merged 1 commit into from
Jan 9, 2025
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 12 additions & 8 deletions src/core/Akka/Akka.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -11,15 +11,19 @@
<EmbeddedResource Include="Configuration\akka.conf" />
</ItemGroup>

<!-- Common packages for all target frameworks -->
<ItemGroup>
<PackageReference Include="Polyfill" Version="1.28.0" PrivateAssets="all" />
<PackageReference Include="Microsoft.Extensions.ObjectPool" Version="$(MsExtVersion)" />
<PackageReference Include="Newtonsoft.Json" Version="$(NewtonsoftJsonVersion)" />
<PackageReference Include="System.Reflection.Emit" Version="4.7.0" />
<PackageReference Include="System.Collections.Immutable" Version="$(MicrosoftLibVersion)" />
<PackageReference Include="System.Threading.Channels" Version="$(MicrosoftLibVersion)" />
<PackageReference Include="System.Configuration.ConfigurationManager" Version="$(ConfigurationManagerVersion)"/>

<PackageReference Include="Microsoft.Extensions.ObjectPool" Version="$(MsExtVersion)" />
<PackageReference Include="Newtonsoft.Json" Version="$(NewtonsoftJsonVersion)" />
<PackageReference Include="System.Collections.Immutable" Version="$(MicrosoftLibVersion)" />
<PackageReference Include="System.Configuration.ConfigurationManager" Version="$(ConfigurationManagerVersion)"/>
</ItemGroup>

<!-- Packages only for NetStandard -->
<ItemGroup Condition="'$(TargetFramework)' == '$(NetStandardLibVersion)'">
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

  • Don't need Polyfill on newer versions of .NET where record et al are natively supported
  • Don't need System.Reflection.Emit (built into BCL)
  • Don't need System.Threading.Channels (built into BCL)

These are pre-requisites for supporting #6855 - which is going to require a System.Diagnostics.Activity dependency for netstandard2.0 only.

<PackageReference Include="Polyfill" Version="1.28.0" PrivateAssets="all" />
<PackageReference Include="System.Reflection.Emit" Version="4.7.0" />
<PackageReference Include="System.Threading.Channels" Version="$(MicrosoftLibVersion)" />
</ItemGroup>

<ItemGroup Label="PublicAnalyzers">
Expand Down
Loading