Skip to content

Commit

Permalink
#2305 Remove polyfill packages
Browse files Browse the repository at this point in the history
  • Loading branch information
thompson-tomo committed May 8, 2024
1 parent 1a0b9e9 commit e59b174
Showing 1 changed file with 18 additions and 9 deletions.
27 changes: 18 additions & 9 deletions src/Elastic.Apm/Elastic.Apm.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@
<Reference Include="System.Configuration" />
</ItemGroup>

<ItemGroup Condition="'$(DiagnosticSourceVersion)' == ''">
<ItemGroup Condition="'$(DiagnosticSourceVersion)' == '' and ('$(TargetFramework)'=='net472' or '$(TargetFramework)'=='net462' or '$(TargetFramework)' == 'netstandard2.0')">
<PackageReference Include="System.Diagnostics.DiagnosticSource" Version="5.0.0" />
</ItemGroup>
<!-- DiagnosticSourceVersion MsBuild property can be used to compile the agent against a specific version of
Expand All @@ -84,18 +84,27 @@
<ItemGroup Condition="'$(DiagnosticSourceVersion)' != ''">
<PackageReference Include="System.Diagnostics.DiagnosticSource" Version="$(DiagnosticSourceVersion)" />
</ItemGroup>
<ItemGroup Condition="'$(TargetFramework)' == 'netstandard2.0'">
<PackageReference Include="System.Diagnostics.PerformanceCounter" Version="4.5.0" />
</ItemGroup>
<ItemGroup Condition="'$(TargetFramework)' != 'netstandard2.0'">

<ItemGroup Condition="'$(TargetFramework)'=='net472' or '$(TargetFramework)'=='net462'">
<!-- Used by Ben.Demystifier -->
<PackageReference Include="System.Reflection.Metadata" Version="5.0.0" />
<PackageReference Include="System.Threading.Tasks.Extensions" Version="4.5.4" />

<PackageReference Include="System.Threading.Tasks.Dataflow" Version="4.9.0" />
<PackageReference Include="System.Diagnostics.PerformanceCounter" Version="6.0.1" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="System.Threading.Tasks.Dataflow" Version="4.9.0" />

<ItemGroup Condition="'$(TargetFramework)' == 'netstandard2.0'">
<PackageReference Include="System.Diagnostics.PerformanceCounter" Version="4.5.0" />
<!-- Used by Ben.Demystifier -->
<PackageReference Include="System.Reflection.Metadata" Version="5.0.0" />
<PackageReference Include="System.Threading.Tasks.Extensions" Version="4.5.4" />

<PackageReference Include="System.Threading.Tasks.Dataflow" Version="4.9.0" />
</ItemGroup>

<ItemGroup Condition="'$(TargetFramework)' == 'net6.0'">
<PackageReference Include="System.Diagnostics.PerformanceCounter" Version="6.0.1" />
</ItemGroup>

<!-- Newtonsoft.Json constants -->
Expand All @@ -113,5 +122,5 @@
<PackagePath>.</PackagePath>
</None>
</ItemGroup>

</Project>

0 comments on commit e59b174

Please sign in to comment.