diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 269d4dc8a1..d575ad7245 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -26,10 +26,8 @@ jobs:
steps:
- uses: actions/checkout@v3
- - name: Install .NET 7 SDK
- uses: actions/setup-dotnet@v3.2.0
- with:
- dotnet-version: '7.0.x'
+ - name: Setup dotnet
+ uses: actions/setup-dotnet@v3
- name: Install dependencies
run: dotnet restore
diff --git a/.github/workflows/dotnet-core-cov.yml b/.github/workflows/dotnet-core-cov.yml
index be6b24e964..fe8c9e2e84 100644
--- a/.github/workflows/dotnet-core-cov.yml
+++ b/.github/workflows/dotnet-core-cov.yml
@@ -24,10 +24,8 @@ jobs:
with:
fetch-depth: 0 # fetching all
- - name: Setup .NET 7.0
- uses: actions/setup-dotnet@v3.2.0
- with:
- dotnet-version: '7.0.x'
+ - name: Setup dotnet
+ uses: actions/setup-dotnet@v3
- name: Install dependencies
run: dotnet restore
diff --git a/.github/workflows/dotnet-format.yml b/.github/workflows/dotnet-format.yml
index 45f9c26166..3f49401a03 100644
--- a/.github/workflows/dotnet-format.yml
+++ b/.github/workflows/dotnet-format.yml
@@ -20,10 +20,8 @@ jobs:
- name: check out code
uses: actions/checkout@v3
- - name: Install .NET 7 SDK
- uses: actions/setup-dotnet@v3.2.0
- with:
- dotnet-version: '7.0.x'
+ - name: Setup dotnet
+ uses: actions/setup-dotnet@v3
- name: Install format tool
run: dotnet tool install -g dotnet-format
diff --git a/.github/workflows/package-Exporter.Geneva.yml b/.github/workflows/package-Exporter.Geneva.yml
index 44111dca8b..77a5cca48d 100644
--- a/.github/workflows/package-Exporter.Geneva.yml
+++ b/.github/workflows/package-Exporter.Geneva.yml
@@ -28,9 +28,8 @@ jobs:
with:
fetch-depth: 0 # fetching all
- - uses: actions/setup-dotnet@v3.2.0
- with:
- dotnet-version: '7.0.x'
+ - name: Setup dotnet
+ uses: actions/setup-dotnet@v3
- name: Install dependencies
run: dotnet restore src/${{env.PROJECT}}
diff --git a/.github/workflows/package-Exporter.InfluxDB.yml b/.github/workflows/package-Exporter.InfluxDB.yml
index fcceeaa2cf..2d969e87b9 100644
--- a/.github/workflows/package-Exporter.InfluxDB.yml
+++ b/.github/workflows/package-Exporter.InfluxDB.yml
@@ -28,9 +28,8 @@ jobs:
with:
fetch-depth: 0 # fetching all
- - uses: actions/setup-dotnet@v3.2.0
- with:
- dotnet-version: '7.0.x'
+ - name: Setup dotnet
+ uses: actions/setup-dotnet@v3
- name: Install dependencies
run: dotnet restore src/${{env.PROJECT}}
diff --git a/.github/workflows/package-Exporter.Instana.yml b/.github/workflows/package-Exporter.Instana.yml
index 71168712b3..70e7f06838 100644
--- a/.github/workflows/package-Exporter.Instana.yml
+++ b/.github/workflows/package-Exporter.Instana.yml
@@ -28,9 +28,8 @@ jobs:
with:
fetch-depth: 0 # fetching all
- - uses: actions/setup-dotnet@v3.2.0
- with:
- dotnet-version: '7.0.x'
+ - name: Setup dotnet
+ uses: actions/setup-dotnet@v3
- name: Install dependencies
run: dotnet restore src/${{env.PROJECT}}
diff --git a/.github/workflows/package-Exporter.OneCollector.yml b/.github/workflows/package-Exporter.OneCollector.yml
index 910bdaa0a2..a6fc9ccc80 100644
--- a/.github/workflows/package-Exporter.OneCollector.yml
+++ b/.github/workflows/package-Exporter.OneCollector.yml
@@ -28,9 +28,8 @@ jobs:
with:
fetch-depth: 0 # fetching all
- - uses: actions/setup-dotnet@v3.2.0
- with:
- dotnet-version: '7.0.x'
+ - name: Setup dotnet
+ uses: actions/setup-dotnet@v3
- name: Install dependencies
run: dotnet restore src/${{env.PROJECT}}
diff --git a/.github/workflows/package-Exporter.Stackdriver.yml b/.github/workflows/package-Exporter.Stackdriver.yml
index 399dc1f707..bf15aa38d1 100644
--- a/.github/workflows/package-Exporter.Stackdriver.yml
+++ b/.github/workflows/package-Exporter.Stackdriver.yml
@@ -28,9 +28,8 @@ jobs:
with:
fetch-depth: 0 # fetching all
- - uses: actions/setup-dotnet@v3.2.0
- with:
- dotnet-version: '7.0.x'
+ - name: Setup dotnet
+ uses: actions/setup-dotnet@v3
- name: Install dependencies
run: dotnet restore src/${{env.PROJECT}}
diff --git a/.github/workflows/package-Extensions.AWS.yml b/.github/workflows/package-Extensions.AWS.yml
index 0fc49d3e51..801f15dc66 100644
--- a/.github/workflows/package-Extensions.AWS.yml
+++ b/.github/workflows/package-Extensions.AWS.yml
@@ -28,9 +28,8 @@ jobs:
with:
fetch-depth: 0 # fetching all
- - uses: actions/setup-dotnet@v3.2.0
- with:
- dotnet-version: '7.0.x'
+ - name: Setup dotnet
+ uses: actions/setup-dotnet@v3
- name: Install dependencies
run: dotnet restore src/${{env.PROJECT}}
diff --git a/.github/workflows/package-Extensions.Enrichment.yml b/.github/workflows/package-Extensions.Enrichment.yml
index ebcd7b80a1..c504dc24e0 100644
--- a/.github/workflows/package-Extensions.Enrichment.yml
+++ b/.github/workflows/package-Extensions.Enrichment.yml
@@ -28,9 +28,8 @@ jobs:
with:
fetch-depth: 0 # fetching all
- - uses: actions/setup-dotnet@v3.2.0
- with:
- dotnet-version: '7.0.x'
+ - name: Setup dotnet
+ uses: actions/setup-dotnet@v3
- name: Install dependencies
run: dotnet restore src/${{env.PROJECT}}
diff --git a/.github/workflows/package-Extensions.yml b/.github/workflows/package-Extensions.yml
index 3efc67ad40..c18c2cfe6b 100644
--- a/.github/workflows/package-Extensions.yml
+++ b/.github/workflows/package-Extensions.yml
@@ -28,9 +28,8 @@ jobs:
with:
fetch-depth: 0 # fetching all
- - uses: actions/setup-dotnet@v3.2.0
- with:
- dotnet-version: '7.0.x'
+ - name: Setup dotnet
+ uses: actions/setup-dotnet@v3
- name: Install dependencies
run: dotnet restore src/${{env.PROJECT}}
diff --git a/.github/workflows/package-Instrumentation.AWS.yml b/.github/workflows/package-Instrumentation.AWS.yml
index c8bdd9068a..a212b3de13 100644
--- a/.github/workflows/package-Instrumentation.AWS.yml
+++ b/.github/workflows/package-Instrumentation.AWS.yml
@@ -28,9 +28,8 @@ jobs:
with:
fetch-depth: 0 # fetching all
- - uses: actions/setup-dotnet@v3.2.0
- with:
- dotnet-version: '7.0.x'
+ - name: Setup dotnet
+ uses: actions/setup-dotnet@v3
- name: Install dependencies
run: dotnet restore src/${{env.PROJECT}}
diff --git a/.github/workflows/package-Instrumentation.AWSLambda.yml b/.github/workflows/package-Instrumentation.AWSLambda.yml
index 8043daf093..b1d1f35124 100644
--- a/.github/workflows/package-Instrumentation.AWSLambda.yml
+++ b/.github/workflows/package-Instrumentation.AWSLambda.yml
@@ -28,9 +28,8 @@ jobs:
with:
fetch-depth: 0 # fetching all
- - uses: actions/setup-dotnet@v3.2.0
- with:
- dotnet-version: '7.0.x'
+ - name: Setup dotnet
+ uses: actions/setup-dotnet@v3
- name: Install dependencies
run: dotnet restore src/${{env.PROJECT}}
diff --git a/.github/workflows/package-Instrumentation.AspNet.TelemetryHttpModule.yml b/.github/workflows/package-Instrumentation.AspNet.TelemetryHttpModule.yml
index 888f0e3c9e..26027d7566 100644
--- a/.github/workflows/package-Instrumentation.AspNet.TelemetryHttpModule.yml
+++ b/.github/workflows/package-Instrumentation.AspNet.TelemetryHttpModule.yml
@@ -28,9 +28,8 @@ jobs:
with:
fetch-depth: 0 # fetching all
- - uses: actions/setup-dotnet@v3.2.0
- with:
- dotnet-version: '7.0.x'
+ - name: Setup dotnet
+ uses: actions/setup-dotnet@v3
- name: Install dependencies
run: dotnet restore src/${{env.PROJECT}}
diff --git a/.github/workflows/package-Instrumentation.AspNet.yml b/.github/workflows/package-Instrumentation.AspNet.yml
index ffaac9cd77..b082a8707c 100644
--- a/.github/workflows/package-Instrumentation.AspNet.yml
+++ b/.github/workflows/package-Instrumentation.AspNet.yml
@@ -28,9 +28,8 @@ jobs:
with:
fetch-depth: 0 # fetching all
- - uses: actions/setup-dotnet@v3.2.0
- with:
- dotnet-version: '7.0.x'
+ - name: Setup dotnet
+ uses: actions/setup-dotnet@v3
- name: Install dependencies
run: dotnet restore src/${{env.PROJECT}}
diff --git a/.github/workflows/package-Instrumentation.Cassandra.yml b/.github/workflows/package-Instrumentation.Cassandra.yml
index bc43454401..d67c4d3506 100644
--- a/.github/workflows/package-Instrumentation.Cassandra.yml
+++ b/.github/workflows/package-Instrumentation.Cassandra.yml
@@ -26,9 +26,8 @@ jobs:
with:
fetch-depth: 0 # fetching all
- - uses: actions/setup-dotnet@v3.2.0
- with:
- dotnet-version: '7.0.x'
+ - name: Setup dotnet
+ uses: actions/setup-dotnet@v3
- name: Install dependencies
run: dotnet restore src/${{env.PROJECT}}
diff --git a/.github/workflows/package-Instrumentation.Elasticsearch.yml b/.github/workflows/package-Instrumentation.Elasticsearch.yml
index 927fdf59ea..74f81be176 100644
--- a/.github/workflows/package-Instrumentation.Elasticsearch.yml
+++ b/.github/workflows/package-Instrumentation.Elasticsearch.yml
@@ -28,9 +28,8 @@ jobs:
with:
fetch-depth: 0 # fetching all
- - uses: actions/setup-dotnet@v3.2.0
- with:
- dotnet-version: '7.0.x'
+ - name: Setup dotnet
+ uses: actions/setup-dotnet@v3
- name: Install dependencies
run: dotnet restore src/${{env.PROJECT}}
diff --git a/.github/workflows/package-Instrumentation.EntityFrameworkCore.yml b/.github/workflows/package-Instrumentation.EntityFrameworkCore.yml
index 154369efd3..e3d64c5641 100644
--- a/.github/workflows/package-Instrumentation.EntityFrameworkCore.yml
+++ b/.github/workflows/package-Instrumentation.EntityFrameworkCore.yml
@@ -28,9 +28,8 @@ jobs:
with:
fetch-depth: 0 # fetching all
- - uses: actions/setup-dotnet@v3.2.0
- with:
- dotnet-version: '7.0.x'
+ - name: Setup dotnet
+ uses: actions/setup-dotnet@v3
- name: Install dependencies
run: dotnet restore src/${{env.PROJECT}}
diff --git a/.github/workflows/package-Instrumentation.EventCounters.yml b/.github/workflows/package-Instrumentation.EventCounters.yml
index b5baf9ff3b..cd3f25bd9a 100644
--- a/.github/workflows/package-Instrumentation.EventCounters.yml
+++ b/.github/workflows/package-Instrumentation.EventCounters.yml
@@ -28,9 +28,8 @@ jobs:
with:
fetch-depth: 0 # fetching all
- - uses: actions/setup-dotnet@v3.2.0
- with:
- dotnet-version: '7.0.x'
+ - name: Setup dotnet
+ uses: actions/setup-dotnet@v3
- name: Install dependencies
run: dotnet restore src/${{env.PROJECT}}
diff --git a/.github/workflows/package-Instrumentation.GrpcCore.yml b/.github/workflows/package-Instrumentation.GrpcCore.yml
index 04e6174c5a..23b198fbe3 100644
--- a/.github/workflows/package-Instrumentation.GrpcCore.yml
+++ b/.github/workflows/package-Instrumentation.GrpcCore.yml
@@ -28,9 +28,8 @@ jobs:
with:
fetch-depth: 0 # fetching all
- - uses: actions/setup-dotnet@v3.2.0
- with:
- dotnet-version: '7.0.x'
+ - name: Setup dotnet
+ uses: actions/setup-dotnet@v3
- name: Install dependencies
run: dotnet restore src/${{env.PROJECT}}
diff --git a/.github/workflows/package-Instrumentation.Hangfire.yml b/.github/workflows/package-Instrumentation.Hangfire.yml
index d27017c7bd..1b7d1ad31c 100644
--- a/.github/workflows/package-Instrumentation.Hangfire.yml
+++ b/.github/workflows/package-Instrumentation.Hangfire.yml
@@ -28,9 +28,8 @@ jobs:
with:
fetch-depth: 0 # fetching all
- - uses: actions/setup-dotnet@v3.2.0
- with:
- dotnet-version: '7.0.x'
+ - name: Setup dotnet
+ uses: actions/setup-dotnet@v3
- name: Install dependencies
run: dotnet restore src/${{env.PROJECT}}
diff --git a/.github/workflows/package-Instrumentation.MySqlData.yml b/.github/workflows/package-Instrumentation.MySqlData.yml
index 97252dc255..9431b441c7 100644
--- a/.github/workflows/package-Instrumentation.MySqlData.yml
+++ b/.github/workflows/package-Instrumentation.MySqlData.yml
@@ -28,9 +28,8 @@ jobs:
with:
fetch-depth: 0 # fetching all
- - uses: actions/setup-dotnet@v3.2.0
- with:
- dotnet-version: '7.0.x'
+ - name: Setup dotnet
+ uses: actions/setup-dotnet@v3'
- name: Install dependencies
run: dotnet restore src/${{env.PROJECT}}
diff --git a/.github/workflows/package-Instrumentation.Owin.yml b/.github/workflows/package-Instrumentation.Owin.yml
index 0361835651..84b617d4c6 100644
--- a/.github/workflows/package-Instrumentation.Owin.yml
+++ b/.github/workflows/package-Instrumentation.Owin.yml
@@ -28,9 +28,8 @@ jobs:
with:
fetch-depth: 0 # fetching all
- - uses: actions/setup-dotnet@v3.2.0
- with:
- dotnet-version: '7.0.x'
+ - name: Setup dotnet
+ uses: actions/setup-dotnet@v3
- name: Install dependencies
run: dotnet restore src/${{env.PROJECT}}
diff --git a/.github/workflows/package-Instrumentation.Process.yml b/.github/workflows/package-Instrumentation.Process.yml
index ffc2e8d456..c9a71950d5 100644
--- a/.github/workflows/package-Instrumentation.Process.yml
+++ b/.github/workflows/package-Instrumentation.Process.yml
@@ -28,9 +28,8 @@ jobs:
with:
fetch-depth: 0 # fetching all
- - uses: actions/setup-dotnet@v3.2.0
- with:
- dotnet-version: '7.0.x'
+ - name: Setup dotnet
+ uses: actions/setup-dotnet@v3
- name: Install dependencies
run: dotnet restore src/${{env.PROJECT}}
diff --git a/.github/workflows/package-Instrumentation.Quartz.yml b/.github/workflows/package-Instrumentation.Quartz.yml
index 36c7ec098e..24b6d29c84 100644
--- a/.github/workflows/package-Instrumentation.Quartz.yml
+++ b/.github/workflows/package-Instrumentation.Quartz.yml
@@ -28,9 +28,8 @@ jobs:
with:
fetch-depth: 0 # fetching all
- - uses: actions/setup-dotnet@v3.2.0
- with:
- dotnet-version: '7.0.x'
+ - name: Setup dotnet
+ uses: actions/setup-dotnet@v3
- name: Install dependencies
run: dotnet restore src/${{env.PROJECT}}
diff --git a/.github/workflows/package-Instrumentation.Runtime.yml b/.github/workflows/package-Instrumentation.Runtime.yml
index b717dd6f0e..21b20ded16 100644
--- a/.github/workflows/package-Instrumentation.Runtime.yml
+++ b/.github/workflows/package-Instrumentation.Runtime.yml
@@ -28,9 +28,8 @@ jobs:
with:
fetch-depth: 0 # fetching all
- - uses: actions/setup-dotnet@v3.2.0
- with:
- dotnet-version: '7.0.x'
+ - name: Setup dotnet
+ uses: actions/setup-dotnet@v3
- name: Install dependencies
run: dotnet restore src/${{env.PROJECT}}
diff --git a/.github/workflows/package-Instrumentation.StackExchangeRedis.yml b/.github/workflows/package-Instrumentation.StackExchangeRedis.yml
index f2a8b8a278..aa2efffe4e 100644
--- a/.github/workflows/package-Instrumentation.StackExchangeRedis.yml
+++ b/.github/workflows/package-Instrumentation.StackExchangeRedis.yml
@@ -1,4 +1,4 @@
-name: Pack OpenTelemetry.Instrumentation.StackExchangeRedis
+Profilername: Pack OpenTelemetry.Instrumentation.StackExchangeRedis
on:
workflow_dispatch:
@@ -28,9 +28,8 @@ jobs:
with:
fetch-depth: 0 # fetching all
- - uses: actions/setup-dotnet@v3.2.0
- with:
- dotnet-version: '7.0.x'
+ - name: Setup dotnet
+ uses: actions/setup-dotnet@v3
- name: Install dependencies
run: dotnet restore src/${{env.PROJECT}}
diff --git a/.github/workflows/package-Instrumentation.Wcf.yml b/.github/workflows/package-Instrumentation.Wcf.yml
index 35bed0e435..823368e89e 100644
--- a/.github/workflows/package-Instrumentation.Wcf.yml
+++ b/.github/workflows/package-Instrumentation.Wcf.yml
@@ -28,9 +28,8 @@ jobs:
with:
fetch-depth: 0 # fetching all
- - uses: actions/setup-dotnet@v3.2.0
- with:
- dotnet-version: '7.0.x'
+ - name: Setup dotnet
+ uses: actions/setup-dotnet@v3
- name: Install dependencies
run: dotnet restore src/${{env.PROJECT}}
diff --git a/.github/workflows/package-PersistentStorage.Abstractions.yml b/.github/workflows/package-PersistentStorage.Abstractions.yml
index 327c47d364..b757cb4416 100644
--- a/.github/workflows/package-PersistentStorage.Abstractions.yml
+++ b/.github/workflows/package-PersistentStorage.Abstractions.yml
@@ -28,9 +28,8 @@ jobs:
with:
fetch-depth: 0 # fetching all
- - uses: actions/setup-dotnet@v3.2.0
- with:
- dotnet-version: '7.0.x'
+ - name: Setup dotnet
+ uses: actions/setup-dotnet@v3
- name: Install dependencies
run: dotnet restore src/${{env.PROJECT}}
diff --git a/.github/workflows/package-PersistentStorage.FileSystem.yml b/.github/workflows/package-PersistentStorage.FileSystem.yml
index 0a6dd92858..09bee39744 100644
--- a/.github/workflows/package-PersistentStorage.FileSystem.yml
+++ b/.github/workflows/package-PersistentStorage.FileSystem.yml
@@ -28,9 +28,8 @@ jobs:
with:
fetch-depth: 0 # fetching all
- - uses: actions/setup-dotnet@v3.2.0
- with:
- dotnet-version: '7.0.x'
+ - name: Setup dotnet
+ uses: actions/setup-dotnet@v3
- name: Install dependencies
run: dotnet restore src/${{env.PROJECT}}
diff --git a/.github/workflows/package-ResourceDetectors.AWS.yml b/.github/workflows/package-ResourceDetectors.AWS.yml
index e9c4c8e286..6c68853329 100644
--- a/.github/workflows/package-ResourceDetectors.AWS.yml
+++ b/.github/workflows/package-ResourceDetectors.AWS.yml
@@ -28,9 +28,8 @@ jobs:
with:
fetch-depth: 0 # fetching all
- - uses: actions/setup-dotnet@v3.2.0
- with:
- dotnet-version: '7.0.x'
+ - name: Setup dotnet
+ uses: actions/setup-dotnet@v3
- name: Install dependencies
run: dotnet restore src/${{env.PROJECT}}
diff --git a/.github/workflows/package-ResourceDetectors.Azure.yml b/.github/workflows/package-ResourceDetectors.Azure.yml
index fc467ad5ce..87607aaaf1 100644
--- a/.github/workflows/package-ResourceDetectors.Azure.yml
+++ b/.github/workflows/package-ResourceDetectors.Azure.yml
@@ -28,9 +28,8 @@ jobs:
with:
fetch-depth: 0 # fetching all
- - uses: actions/setup-dotnet@v3.2.0
- with:
- dotnet-version: '7.0.x'
+ - name: Setup dotnet
+ uses: actions/setup-dotnet@v3
- name: Install dependencies
run: dotnet restore src/${{env.PROJECT}}
diff --git a/.github/workflows/package-ResourceDetectors.Container.yml b/.github/workflows/package-ResourceDetectors.Container.yml
index 2065f874c1..1bf1f5765b 100644
--- a/.github/workflows/package-ResourceDetectors.Container.yml
+++ b/.github/workflows/package-ResourceDetectors.Container.yml
@@ -28,9 +28,8 @@ jobs:
with:
fetch-depth: 0 # fetching all
- - uses: actions/setup-dotnet@v3.2.0
- with:
- dotnet-version: '7.0.x'
+ - name: Setup dotnet
+ uses: actions/setup-dotnet@v3
- name: Install dependencies
run: dotnet restore src/${{env.PROJECT}}
diff --git a/.github/workflows/package-Sampler.AWS.yml b/.github/workflows/package-Sampler.AWS.yml
index 04619fbb07..6f82f2c6cd 100644
--- a/.github/workflows/package-Sampler.AWS.yml
+++ b/.github/workflows/package-Sampler.AWS.yml
@@ -28,9 +28,8 @@ jobs:
with:
fetch-depth: 0 # fetching all
- - uses: actions/setup-dotnet@v3.2.0
- with:
- dotnet-version: '7.0.x'
+ - name: Setup dotnet
+ uses: actions/setup-dotnet@v3
- name: Install dependencies
run: dotnet restore src/${{env.PROJECT}}
diff --git a/build/Common.props b/build/Common.props
index 33f16d0985..641130c4cb 100644
--- a/build/Common.props
+++ b/build/Common.props
@@ -9,6 +9,7 @@
net462
net6.0
netstandard2.0
+ true
latest-All
diff --git a/global.json b/global.json
index 0f417661e6..aeb8ae7b1e 100644
--- a/global.json
+++ b/global.json
@@ -1,6 +1,6 @@
{
"sdk": {
"rollForward": "latestFeature",
- "version": "7.0.101"
+ "version": "7.0.400"
}
}
diff --git a/test/OpenTelemetry.Instrumentation.AWS.Tests/TestAWSClientInstrumentation.cs b/test/OpenTelemetry.Instrumentation.AWS.Tests/TestAWSClientInstrumentation.cs
index 2bca456c94..96dddf36c8 100644
--- a/test/OpenTelemetry.Instrumentation.AWS.Tests/TestAWSClientInstrumentation.cs
+++ b/test/OpenTelemetry.Instrumentation.AWS.Tests/TestAWSClientInstrumentation.cs
@@ -17,7 +17,9 @@
using System.Collections.Generic;
using System.Diagnostics;
using System.Linq;
+#if !NETFRAMEWORK
using System.Threading.Tasks;
+#endif
using Amazon;
using Amazon.DynamoDBv2;
using Amazon.DynamoDBv2.Model;
diff --git a/test/OpenTelemetry.Instrumentation.StackExchangeRedis.Tests/Implementation/RedisProfilerEntryToActivityConverterTests.cs b/test/OpenTelemetry.Instrumentation.StackExchangeRedis.Tests/Implementation/RedisProfilerEntryToActivityConverterTests.cs
index f92bf20aaa..dcec655941 100644
--- a/test/OpenTelemetry.Instrumentation.StackExchangeRedis.Tests/Implementation/RedisProfilerEntryToActivityConverterTests.cs
+++ b/test/OpenTelemetry.Instrumentation.StackExchangeRedis.Tests/Implementation/RedisProfilerEntryToActivityConverterTests.cs
@@ -17,7 +17,9 @@
using System;
using System.Diagnostics;
using System.Net;
+#if !NETFRAMEWORK
using System.Net.Sockets;
+#endif
using Moq;
using OpenTelemetry.Tests;
using OpenTelemetry.Trace;
diff --git a/test/OpenTelemetry.Sampler.AWS.Tests/TestClock.cs b/test/OpenTelemetry.Sampler.AWS.Tests/TestClock.cs
index 2de7500de5..a5444b3b9a 100644
--- a/test/OpenTelemetry.Sampler.AWS.Tests/TestClock.cs
+++ b/test/OpenTelemetry.Sampler.AWS.Tests/TestClock.cs
@@ -15,11 +15,6 @@
//
using System;
-using System.Collections.Generic;
-using System.Diagnostics;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
namespace OpenTelemetry.Sampler.AWS.Tests;
diff --git a/test/OpenTelemetry.Sampler.AWS.Tests/TestRateLimiter.cs b/test/OpenTelemetry.Sampler.AWS.Tests/TestRateLimiter.cs
index 4ac5fb4aa9..446cb4af6e 100644
--- a/test/OpenTelemetry.Sampler.AWS.Tests/TestRateLimiter.cs
+++ b/test/OpenTelemetry.Sampler.AWS.Tests/TestRateLimiter.cs
@@ -25,7 +25,7 @@ namespace OpenTelemetry.Sampler.AWS.Tests;
///
/// This class is a .Net port of the original Java implementation.
/// This class was taken from Jaeger java client.
-/// https://github.com/jaegertracing/jaeger-client-java/blob/master/jaeger-core/src/test/java/io/jaegertracing/internal/utils/RateLimiterTest.java
+/// https://github.com/jaegertracing/jaeger-client-java/blob/master/jaeger-core/src/test/java/io/jaegertracing/internal/utils/RateLimiterTest.java.
///
public class TestRateLimiter
{