Skip to content

Commit 76f141a

Browse files
Fix-up package references
- Move OpenTelemetry.Instrumentation.AspNetCore to the right group. - Remove `OpenTelemetry.Instrumentation.MySqlData` accidentally re-added during rebase.
1 parent cbdedb3 commit 76f141a

File tree

1 file changed

+2
-6
lines changed

1 file changed

+2
-6
lines changed

src/Grafana.OpenTelemetry/Grafana.OpenTelemetry.csproj

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -32,25 +32,21 @@
3232
<PackageReference Include="OpenTelemetry.Instrumentation.AWSLambda" Version="1.12.0" />
3333
</ItemGroup>
3434

35-
<ItemGroup Condition=" '$([MSBuild]::GetTargetFrameworkIdentifier(`$(TargetFramework)`))' != '.NETFramework' ">
35+
<ItemGroup Label="Non-stable instrumentation packages with dependencies, only .NET" Condition=" '$([MSBuild]::GetTargetFrameworkIdentifier(`$(TargetFramework)`))' != '.NETFramework' ">
3636
<PackageReference Include="OpenTelemetry.Extensions.Hosting" Version="1.12.0" /> <!-- Needed for ASP.NET Core -->
37+
<PackageReference Include="OpenTelemetry.Instrumentation.AspNetCore" Version="1.12.0" />
3738
</ItemGroup>
3839

3940
<ItemGroup Label="Non-stable instrumentation packages with dependencies">
4041
<PackageReference Include="OpenTelemetry.Instrumentation.Cassandra" Version="1.0.0-beta.2" />
4142
<PackageReference Include="OpenTelemetry.Instrumentation.ElasticsearchClient" Version="1.0.0-beta.5" />
4243
<PackageReference Include="OpenTelemetry.Instrumentation.EntityFrameworkCore" Version="1.12.0-beta.2" />
4344
<PackageReference Include="OpenTelemetry.Instrumentation.Hangfire" Version="1.12.0-beta.1" />
44-
<PackageReference Include="OpenTelemetry.Instrumentation.MySqlData" Version="1.0.0-beta.7" />
4545
<PackageReference Include="OpenTelemetry.Instrumentation.Quartz" Version="1.12.0-beta.1" />
4646
<PackageReference Include="OpenTelemetry.Instrumentation.StackExchangeRedis" Version="1.12.0-beta.1" />
4747
<PackageReference Include="OpenTelemetry.Instrumentation.Wcf" Version="1.12.0-beta.1" />
4848
</ItemGroup>
4949

50-
<ItemGroup Label="Non-stable instrumentation packages with dependencies, only .NET" Condition=" '$([MSBuild]::GetTargetFrameworkIdentifier(`$(TargetFramework)`))' != '.NETFramework' ">
51-
<PackageReference Include="OpenTelemetry.Instrumentation.AspNetCore" Version="1.12.0" />
52-
</ItemGroup>
53-
5450
<ItemGroup Label="Non-stable instrumentation packages with dependencies, only .NET Framework" Condition=" '$([MSBuild]::GetTargetFrameworkIdentifier(`$(TargetFramework)`))' == '.NETFramework' ">
5551
<PackageReference Include="OpenTelemetry.Instrumentation.AspNet" Version="1.12.0-beta.1" />
5652
<PackageReference Include="OpenTelemetry.Instrumentation.Owin" Version="1.12.0-beta.1" />

0 commit comments

Comments
 (0)