Skip to content

#151 update packages to enable removal of conditions #152

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.

Sign up for GitHub

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

Closed
wants to merge 2 commits into from
Closed

#151 update packages to enable removal of conditions #152

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8cf045d
#151 update packages to enable removal of conditions
thompson-tomo Jun 11, 2025
9e8f8e8
Update CHANGELOG.md
thompson-tomo Jun 11, 2025
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
3 changes: 3 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,9 @@

* Remove reference on System.Text.Json for `net8.0` target framework
([#136](https://github.com/grafana/grafana-opentelemetry-dotnet/pull/136))
* Add open telemetry resources packages to other targets ie net framework & net standard ([#152](https://github.com/grafana/grafana-opentelemetry-dotnet/pull/152))
* Add aws lamba package to other targets ie net framework & net standard ([#152](https://github.com/grafana/grafana-opentelemetry-dotnet/pull/152))
* Bump aws package to stable version ([#152](https://github.com/grafana/grafana-opentelemetry-dotnet/pull/152))

## 1.2.0

Expand Down
17 changes: 5 additions & 12 deletions src/Grafana.OpenTelemetry.Base/Grafana.OpenTelemetry.Base.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,18 +30,11 @@
<PackageReference Include="OpenTelemetry.Instrumentation.Http" Version="1.9.0" />
<PackageReference Include="OpenTelemetry.Instrumentation.Process" Version="0.5.0-beta.7" />
<PackageReference Include="OpenTelemetry.Instrumentation.SqlClient" Version="1.9.0-beta.1" />
</ItemGroup>

<!-- Non-stable instrumentation packages with no dependencies, non netstandard2.0 -->
<ItemGroup Condition=" '$(TargetFramework)' != 'netstandard2.0' ">
<PackageReference Include="OpenTelemetry.Resources.Host" Version="0.1.0-beta.3" />
<PackageReference Include="OpenTelemetry.Resources.OperatingSystem" Version="0.1.0-alpha.4" />
<PackageReference Include="OpenTelemetry.Resources.Process" Version="0.1.0-beta.3" />
<PackageReference Include="OpenTelemetry.Resources.ProcessRuntime" Version="0.1.0-beta.2" />
</ItemGroup>

<ItemGroup Condition="$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', 'net8.0'))">
<PackageReference Include="OpenTelemetry.Resources.Container" Version="1.0.0-beta.9" />
<PackageReference Include="OpenTelemetry.Resources.Container" Version="1.10.0-beta.1" />
<PackageReference Include="OpenTelemetry.Resources.Host" Version="1.10.0-beta.1" />
<PackageReference Include="OpenTelemetry.Resources.OperatingSystem" Version="1.10.0-beta.1" />
<PackageReference Include="OpenTelemetry.Resources.Process" Version="1.10.0-beta.1" />
<PackageReference Include="OpenTelemetry.Resources.ProcessRuntime" Version="1.10.0-beta.1" />
</ItemGroup>

<ItemGroup>
Expand Down
7 changes: 2 additions & 5 deletions src/Grafana.OpenTelemetry/Grafana.OpenTelemetry.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,8 @@
requirements that conflict with recent .NET package versions. -->
<ItemGroup>
<PackageReference Include="CassandraCSharpDriver" Version="[3.17.0,)" />
<PackageReference Include="OpenTelemetry.Instrumentation.AWSLambda" Version="1.11.0" />
<PackageReference Include="OpenTelemetry.Instrumentation.AWS" Version="1.11.0" />
</ItemGroup>

<!-- Stable instrumentation packages with dependencies, only .NET -->
Expand All @@ -36,7 +38,6 @@

<!-- Non-stable instrumentation packages with dependencies, both .NET framework and .NET -->
<ItemGroup>
<PackageReference Include="OpenTelemetry.Instrumentation.AWS" Version="1.10.0-beta.1" />
<PackageReference Include="OpenTelemetry.Instrumentation.Cassandra" Version="1.0.0-beta.1" />
<PackageReference Include="OpenTelemetry.Instrumentation.ElasticsearchClient" Version="1.0.0-beta.5" />
<PackageReference Include="OpenTelemetry.Instrumentation.EntityFrameworkCore" Version="1.0.0-beta.12" />
Expand All @@ -58,10 +59,6 @@
<PackageReference Include="OpenTelemetry.Instrumentation.Owin" Version="1.0.0-rc.6" />
</ItemGroup>

<ItemGroup Condition="$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', 'net8.0'))">
<PackageReference Include="OpenTelemetry.Instrumentation.AWSLambda" Version="1.10.0-beta.1" />
</ItemGroup>

<ItemGroup>
<AssemblyAttribute Include="System.Runtime.CompilerServices.InternalsVisibleTo">
<_Parameter1>Grafana.OpenTelemetry.Tests</_Parameter1>
Expand Down