Skip to content

Commit 54a7105

Browse files
#2305 Remove polyfill packages (#2308)
Co-authored-by: Martijn Laarman <Mpdreamz@gmail.com>
1 parent 2d77e61 commit 54a7105

File tree

1 file changed

+18
-9
lines changed

1 file changed

+18
-9
lines changed

src/Elastic.Apm/Elastic.Apm.csproj

Lines changed: 18 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@
7474
<Reference Include="System.Configuration" />
7575
</ItemGroup>
7676

77-
<ItemGroup Condition="'$(DiagnosticSourceVersion)' == ''">
77+
<ItemGroup Condition="'$(DiagnosticSourceVersion)' == '' and ('$(TargetFramework)'=='net472' or '$(TargetFramework)'=='net462' or '$(TargetFramework)' == 'netstandard2.0')">
7878
<PackageReference Include="System.Diagnostics.DiagnosticSource" Version="5.0.0" />
7979
</ItemGroup>
8080
<!-- DiagnosticSourceVersion MsBuild property can be used to compile the agent against a specific version of
@@ -84,18 +84,27 @@
8484
<ItemGroup Condition="'$(DiagnosticSourceVersion)' != ''">
8585
<PackageReference Include="System.Diagnostics.DiagnosticSource" Version="$(DiagnosticSourceVersion)" />
8686
</ItemGroup>
87-
<ItemGroup Condition="'$(TargetFramework)' == 'netstandard2.0'">
88-
<PackageReference Include="System.Diagnostics.PerformanceCounter" Version="4.5.0" />
89-
</ItemGroup>
90-
<ItemGroup Condition="'$(TargetFramework)' != 'netstandard2.0'">
87+
88+
<ItemGroup Condition="'$(TargetFramework)'=='net472' or '$(TargetFramework)'=='net462'">
89+
<!-- Used by Ben.Demystifier -->
90+
<PackageReference Include="System.Reflection.Metadata" Version="5.0.0" />
91+
<PackageReference Include="System.Threading.Tasks.Extensions" Version="4.5.4" />
92+
93+
<PackageReference Include="System.Threading.Tasks.Dataflow" Version="4.9.0" />
9194
<PackageReference Include="System.Diagnostics.PerformanceCounter" Version="6.0.1" />
9295
</ItemGroup>
93-
94-
<ItemGroup>
95-
<PackageReference Include="System.Threading.Tasks.Dataflow" Version="4.9.0" />
96+
97+
<ItemGroup Condition="'$(TargetFramework)' == 'netstandard2.0'">
98+
<PackageReference Include="System.Diagnostics.PerformanceCounter" Version="4.5.0" />
9699
<!-- Used by Ben.Demystifier -->
97100
<PackageReference Include="System.Reflection.Metadata" Version="5.0.0" />
98101
<PackageReference Include="System.Threading.Tasks.Extensions" Version="4.5.4" />
102+
103+
<PackageReference Include="System.Threading.Tasks.Dataflow" Version="4.9.0" />
104+
</ItemGroup>
105+
106+
<ItemGroup Condition="'$(TargetFramework)' == 'net6.0'">
107+
<PackageReference Include="System.Diagnostics.PerformanceCounter" Version="6.0.1" />
99108
</ItemGroup>
100109

101110
<!-- Newtonsoft.Json constants -->
@@ -113,5 +122,5 @@
113122
<PackagePath>.</PackagePath>
114123
</None>
115124
</ItemGroup>
116-
125+
117126
</Project>

0 commit comments

Comments
 (0)