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.

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

[Instrumentation.AWS] Replace .NET 6 target with .NET 8 #2139

Merged
merged 3 commits into from
Oct 3, 2024
Merged

[Instrumentation.AWS] Replace .NET 6 target with .NET 8 #2139

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
b73bbe7
[Instrumentation.AWS] Replace .NET 6 target with .NET 8
joegoldman2 Oct 3, 2024
4926ca1
Add changelog entry
joegoldman2 Oct 3, 2024
802db5e
Merge branch 'main' into aws-tfm
CodeBlanch Oct 3, 2024
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 src/OpenTelemetry.Instrumentation.AWS/CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,9 @@

## Unreleased

* Drop support for .NET 6 as this target is no longer supported and add .NET 8 target.
([#2139](https://github.com/open-telemetry/opentelemetry-dotnet-contrib/pull/2139))

## 1.1.0-beta.6

Released 2024-Sep-10
Expand Down
8 changes: 4 additions & 4 deletions src/OpenTelemetry.Instrumentation.AWS/OpenTelemetry.Instrumentation.AWS.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,14 @@

<PropertyGroup>
<!-- OmniSharp/VS Code requires TargetFrameworks to be in descending order for IntelliSense and analysis. -->
<TargetFrameworks>net6.0;netstandard2.0</TargetFrameworks>
<TargetFrameworks>net8.0;$(NetStandardMinimumSupportedVersion)</TargetFrameworks>
<TargetFrameworks Condition="$(OS) == 'Windows_NT'">$(TargetFrameworks);$(NetFrameworkMinimumSupportedVersion)</TargetFrameworks>
<Description>AWS client instrumentation for OpenTelemetry .NET</Description>
<Description>AWS client instrumentation for OpenTelemetry .NET.</Description>
<MinVerTagPrefix>Instrumentation.AWS-</MinVerTagPrefix>
</PropertyGroup>

<!--Do not run Package Baseline Validation as this package has never released a stable version.
Remove this property once we have released a stable version and add PackageValidationBaselineVersion property.-->
<!-- Do not run Package Baseline Validation as this package has never released a stable version.
Remove this property once we have released a stable version and add PackageValidationBaselineVersion property. -->
<PropertyGroup>
<DisablePackageBaselineValidation>true</DisablePackageBaselineValidation>
</PropertyGroup>
Expand Down
4 changes: 2 additions & 2 deletions test/OpenTelemetry.Instrumentation.AWS.Tests/OpenTelemetry.Instrumentation.AWS.Tests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<Description>Unit test project for AWS client instrumentation for OpenTelemetry.</Description>
<!-- OmniSharp/VS Code requires TargetFrameworks to be in descending order for IntelliSense and analysis. -->
<TargetFrameworks>net6.0</TargetFrameworks>
<TargetFrameworks>$(SupportedNetTargetsWithoutNet6)</TargetFrameworks>
<TargetFrameworks Condition="$(OS) == 'Windows_NT'">$(TargetFrameworks);$(NetFrameworkMinimumSupportedVersion)</TargetFrameworks>
<Description>Unit test project for AWS client instrumentation for OpenTelemetry.</Description>
</PropertyGroup>

<ItemGroup>
Expand Down
8 changes: 8 additions & 0 deletions test/OpenTelemetry.Instrumentation.AWS.Tests/Tools/HttpResponseMessageBody.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,20 +27,28 @@ public void Dispose()

Stream IHttpResponseBody.OpenResponse()
{
#if NET
ObjectDisposedException.ThrowIf(this.disposed, this);
#else
if (this.disposed)
{
throw new ObjectDisposedException("HttpWebResponseBody");
}
#endif

return this.response.Content.ReadAsStreamAsync().Result;
}

Task<Stream> IHttpResponseBody.OpenResponseAsync()
{
#if NET
ObjectDisposedException.ThrowIf(this.disposed, this);
#else
if (this.disposed)
{
throw new ObjectDisposedException("HttpWebResponseBody");
}
#endif

if (this.response.Content != null)
{
Expand Down
Loading