diff --git a/OpenTelemetry.proj b/OpenTelemetry.proj
index 76d2bf265..6247d1d6c 100644
--- a/OpenTelemetry.proj
+++ b/OpenTelemetry.proj
@@ -1,13 +1,15 @@
-
-
-
+
+
+
+
+
@@ -18,5 +20,4 @@
-
diff --git a/build/Common.prod.props b/build/Common.prod.props
index 1a41b19a1..7cd177f8e 100644
--- a/build/Common.prod.props
+++ b/build/Common.prod.props
@@ -1,9 +1,8 @@
-
-
+
-
+
runtime; build; native; contentfiles; analyzers; buildtransitive
all
@@ -17,13 +16,6 @@
-
- true
- $(MSBuildThisFileDirectory)debug.snk
- $(DefineConstants);SIGNED
- true
-
-
0
@@ -34,23 +26,19 @@
-
-
-
-
git
https://github.com/open-telemetry/opentelemetry-dotnet
- Tracing;OpenTelemetry;Management;Monitoring
+ Observability;OpenTelemetry;Monitoring;Telemetry;Tracing
opentelemetry-icon-color.png
- https://OpenTelemetry.io
+ https://opentelemetry.io
Apache-2.0
- OpenTelemetry authors
+ OpenTelemetry Authors
true
-
+
@@ -60,22 +48,11 @@
snupkg
-
- full
- true
-
-
-
+
true
-
-
-
- All
-
-
diff --git a/build/Common.props b/build/Common.props
index 57db3ec18..0d87a6b57 100644
--- a/build/Common.props
+++ b/build/Common.props
@@ -1,6 +1,15 @@
8.0
+ true
+ $(MSBuildThisFileDirectory)debug.snk
+ $(DefineConstants);SIGNED
+ true
+
+
+
+ full
+ true
@@ -8,13 +17,35 @@
Please sort alphabetically.
Refer to https://docs.microsoft.com/en-us/nuget/concepts/package-versioning for semver syntax.
-->
+ [2.3.0,3.0)
+ [3.6.1,4.0)
+ [2.23.0,3.0)
+ [2.25.0,3.0)
+ [2.1.1,5.0)
+ [2.1.1,5.0)
+ [1.0.7,2.0)
+ [2.1.0,5.0)
[1.0.0,2.0)
+ [1.0.0,2.0)
+ [12.0.2,13.0)
+ [0.12.1,0.13)
+ [2.1.58,3.0)
+ [1.1.118,2.0)
[1.4.0,2.0)
[5.0.0-preview.7.20364.11]
[4.7.0,5.0)
+ [4.7.0,5.0)
+ [4.5.3,5.0)
+
+
+
+
+
+ All
+
diff --git a/build/Common.test.props b/build/Common.test.props
index c4f916f1e..553cb3595 100644
--- a/build/Common.test.props
+++ b/build/Common.test.props
@@ -1,40 +1,29 @@
-
-
+
- true
- $(MSBuildThisFileDirectory)/debug.snk
- $(DefineConstants);SIGNED
- true
$(NoWarn),1574,1591
false
-
-
-
- full
- true
-
-
-
$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildProjectDirectory), 'OpenTelemetry.sln'))\build\OpenTelemetry.test.ruleset
-
-
-
-
-
-
-
-
true
+
+
+ [2.3.1,3.0)
+ [16.6.1,17.0)
+ [4.14.5,5.0)
+ [2.4.2,3.0)
+ [2.4.1,3.0)
+
+
-
- All
-
+
diff --git a/examples/Console/TestJaegerExporter.cs b/examples/Console/TestJaegerExporter.cs
index 305ea137d..bbadd1f66 100644
--- a/examples/Console/TestJaegerExporter.cs
+++ b/examples/Console/TestJaegerExporter.cs
@@ -13,8 +13,6 @@
// See the License for the specific language governing permissions and
// limitations under the License.
//
-using System;
-
using OpenTelemetry;
using OpenTelemetry.Trace;
diff --git a/src/Directory.Build.props b/src/Directory.Build.props
index a7ae27e98..93113cdc8 100644
--- a/src/Directory.Build.props
+++ b/src/Directory.Build.props
@@ -1,3 +1,3 @@
-
\ No newline at end of file
+
diff --git a/src/Directory.Build.targets b/src/Directory.Build.targets
index 5bb8ca80d..b9d2f4bbe 100644
--- a/src/Directory.Build.targets
+++ b/src/Directory.Build.targets
@@ -1,8 +1,8 @@
-
+
all
runtime; build; native; contentfiles; analyzers
-
\ No newline at end of file
+
diff --git a/src/OpenTelemetry.Api/Context/RuntimeContext.cs b/src/OpenTelemetry.Api/Context/RuntimeContext.cs
index 625556c75..c9da7ce5d 100644
--- a/src/OpenTelemetry.Api/Context/RuntimeContext.cs
+++ b/src/OpenTelemetry.Api/Context/RuntimeContext.cs
@@ -16,7 +16,6 @@
using System;
using System.Collections.Concurrent;
-using System.Collections.Generic;
using System.Runtime.CompilerServices;
namespace OpenTelemetry.Context
diff --git a/src/OpenTelemetry.Exporter.Console/OpenTelemetry.Exporter.Console.csproj b/src/OpenTelemetry.Exporter.Console/OpenTelemetry.Exporter.Console.csproj
index 775b12796..2a459ebcf 100644
--- a/src/OpenTelemetry.Exporter.Console/OpenTelemetry.Exporter.Console.csproj
+++ b/src/OpenTelemetry.Exporter.Console/OpenTelemetry.Exporter.Console.csproj
@@ -15,7 +15,7 @@
-
+
diff --git a/src/OpenTelemetry.Exporter.Jaeger/OpenTelemetry.Exporter.Jaeger.csproj b/src/OpenTelemetry.Exporter.Jaeger/OpenTelemetry.Exporter.Jaeger.csproj
index 2b7b33c92..5a0b5f4c4 100644
--- a/src/OpenTelemetry.Exporter.Jaeger/OpenTelemetry.Exporter.Jaeger.csproj
+++ b/src/OpenTelemetry.Exporter.Jaeger/OpenTelemetry.Exporter.Jaeger.csproj
@@ -18,7 +18,7 @@
-
+
diff --git a/src/OpenTelemetry.Exporter.OpenTelemetryProtocol/OpenTelemetry.Exporter.OpenTelemetryProtocol.csproj b/src/OpenTelemetry.Exporter.OpenTelemetryProtocol/OpenTelemetry.Exporter.OpenTelemetryProtocol.csproj
index 413b527e8..57747197f 100644
--- a/src/OpenTelemetry.Exporter.OpenTelemetryProtocol/OpenTelemetry.Exporter.OpenTelemetryProtocol.csproj
+++ b/src/OpenTelemetry.Exporter.OpenTelemetryProtocol/OpenTelemetry.Exporter.OpenTelemetryProtocol.csproj
@@ -2,14 +2,14 @@
net452;net46;netstandard2.0
OpenTelemetry protocol exporter for OpenTelemetry .NET
- $(PackageTags);distributed-tracing
+ $(PackageTags);OTLP
-
-
-
+
+
+
diff --git a/src/OpenTelemetry.Exporter.OpenTelemetryProtocol/TracerProviderBuilderExtensions.cs b/src/OpenTelemetry.Exporter.OpenTelemetryProtocol/TracerProviderBuilderExtensions.cs
index 75ae13d1f..f5437fe4b 100644
--- a/src/OpenTelemetry.Exporter.OpenTelemetryProtocol/TracerProviderBuilderExtensions.cs
+++ b/src/OpenTelemetry.Exporter.OpenTelemetryProtocol/TracerProviderBuilderExtensions.cs
@@ -16,7 +16,6 @@
using System;
using OpenTelemetry.Exporter.OpenTelemetryProtocol;
-using OpenTelemetry.Trace;
namespace OpenTelemetry.Trace
{
diff --git a/src/OpenTelemetry.Exporter.Prometheus/OpenTelemetry.Exporter.Prometheus.csproj b/src/OpenTelemetry.Exporter.Prometheus/OpenTelemetry.Exporter.Prometheus.csproj
index a6d313e9b..9e08301a8 100644
--- a/src/OpenTelemetry.Exporter.Prometheus/OpenTelemetry.Exporter.Prometheus.csproj
+++ b/src/OpenTelemetry.Exporter.Prometheus/OpenTelemetry.Exporter.Prometheus.csproj
@@ -12,9 +12,6 @@
-
- 2.1.1
-
+
-
diff --git a/src/OpenTelemetry.Exporter.Zipkin/OpenTelemetry.Exporter.Zipkin.csproj b/src/OpenTelemetry.Exporter.Zipkin/OpenTelemetry.Exporter.Zipkin.csproj
index c6abc1153..06662dcd0 100644
--- a/src/OpenTelemetry.Exporter.Zipkin/OpenTelemetry.Exporter.Zipkin.csproj
+++ b/src/OpenTelemetry.Exporter.Zipkin/OpenTelemetry.Exporter.Zipkin.csproj
@@ -14,13 +14,13 @@
-
+
-
+
diff --git a/src/OpenTelemetry.Extensions.Hosting/OpenTelemetry.Extensions.Hosting.csproj b/src/OpenTelemetry.Extensions.Hosting/OpenTelemetry.Extensions.Hosting.csproj
index c1c9cf60c..b0018cced 100644
--- a/src/OpenTelemetry.Extensions.Hosting/OpenTelemetry.Extensions.Hosting.csproj
+++ b/src/OpenTelemetry.Extensions.Hosting/OpenTelemetry.Extensions.Hosting.csproj
@@ -6,7 +6,7 @@
-
+
diff --git a/src/OpenTelemetry.Instrumentation.AspNet/OpenTelemetry.Instrumentation.AspNet.csproj b/src/OpenTelemetry.Instrumentation.AspNet/OpenTelemetry.Instrumentation.AspNet.csproj
index 31139a28f..b1642df0d 100644
--- a/src/OpenTelemetry.Instrumentation.AspNet/OpenTelemetry.Instrumentation.AspNet.csproj
+++ b/src/OpenTelemetry.Instrumentation.AspNet/OpenTelemetry.Instrumentation.AspNet.csproj
@@ -14,7 +14,7 @@
-
+
diff --git a/src/OpenTelemetry.Instrumentation.AspNetCore/OpenTelemetry.Instrumentation.AspNetCore.csproj b/src/OpenTelemetry.Instrumentation.AspNetCore/OpenTelemetry.Instrumentation.AspNetCore.csproj
index ce13d20ea..264a16001 100644
--- a/src/OpenTelemetry.Instrumentation.AspNetCore/OpenTelemetry.Instrumentation.AspNetCore.csproj
+++ b/src/OpenTelemetry.Instrumentation.AspNetCore/OpenTelemetry.Instrumentation.AspNetCore.csproj
@@ -11,8 +11,8 @@
-
-
+
+
diff --git a/src/OpenTelemetry.Instrumentation.Grpc/Implementation/GrpcClientDiagnosticListener.cs b/src/OpenTelemetry.Instrumentation.Grpc/Implementation/GrpcClientDiagnosticListener.cs
index 0979cbad2..f1c762201 100644
--- a/src/OpenTelemetry.Instrumentation.Grpc/Implementation/GrpcClientDiagnosticListener.cs
+++ b/src/OpenTelemetry.Instrumentation.Grpc/Implementation/GrpcClientDiagnosticListener.cs
@@ -16,7 +16,6 @@
using System;
using System.Diagnostics;
using System.Net.Http;
-using System.Reflection;
using OpenTelemetry.Trace;
namespace OpenTelemetry.Instrumentation.Grpc.Implementation
diff --git a/src/OpenTelemetry.Instrumentation.StackExchangeRedis/OpenTelemetry.Instrumentation.StackExchangeRedis.csproj b/src/OpenTelemetry.Instrumentation.StackExchangeRedis/OpenTelemetry.Instrumentation.StackExchangeRedis.csproj
index 47adef4f5..080697e66 100644
--- a/src/OpenTelemetry.Instrumentation.StackExchangeRedis/OpenTelemetry.Instrumentation.StackExchangeRedis.csproj
+++ b/src/OpenTelemetry.Instrumentation.StackExchangeRedis/OpenTelemetry.Instrumentation.StackExchangeRedis.csproj
@@ -11,7 +11,7 @@
-
+
diff --git a/src/OpenTelemetry.Shims.OpenTracing/OpenTelemetry.Shims.OpenTracing.csproj b/src/OpenTelemetry.Shims.OpenTracing/OpenTelemetry.Shims.OpenTracing.csproj
index 6c131a39a..6c1eedf82 100644
--- a/src/OpenTelemetry.Shims.OpenTracing/OpenTelemetry.Shims.OpenTracing.csproj
+++ b/src/OpenTelemetry.Shims.OpenTracing/OpenTelemetry.Shims.OpenTracing.csproj
@@ -10,17 +10,14 @@
//TODO: Disable this exception, and actually do document all public API.
-->
+ $(NoWarn),1591
-
- $(NoWarn),1591
-
-
+
-
diff --git a/test/Benchmarks/Exporter/JaegerExporterBenchmarks.cs b/test/Benchmarks/Exporter/JaegerExporterBenchmarks.cs
index 561cb1c7a..5a3a1fa3b 100644
--- a/test/Benchmarks/Exporter/JaegerExporterBenchmarks.cs
+++ b/test/Benchmarks/Exporter/JaegerExporterBenchmarks.cs
@@ -24,7 +24,6 @@ using System.Threading.Tasks;
using BenchmarkDotNet.Attributes;
using OpenTelemetry.Exporter.Jaeger;
using OpenTelemetry.Exporter.Jaeger.Implementation;
-using OpenTelemetry.Trace;
using Thrift.Transport;
namespace Benchmarks.Exporter
diff --git a/test/Benchmarks/Tracing/ActivityCreationScenarios.cs b/test/Benchmarks/Tracing/ActivityCreationScenarios.cs
index 1edf6fb8f..b38840a3c 100644
--- a/test/Benchmarks/Tracing/ActivityCreationScenarios.cs
+++ b/test/Benchmarks/Tracing/ActivityCreationScenarios.cs
@@ -15,7 +15,6 @@
//
using System.Diagnostics;
-using OpenTelemetry.Trace;
namespace Benchmarks.Tracing
{
diff --git a/test/Directory.Build.props b/test/Directory.Build.props
index 8ac11320b..cdb7a248b 100644
--- a/test/Directory.Build.props
+++ b/test/Directory.Build.props
@@ -1,3 +1,3 @@
-
\ No newline at end of file
+
diff --git a/test/Directory.Build.targets b/test/Directory.Build.targets
index 2b1571a4f..71b711cde 100644
--- a/test/Directory.Build.targets
+++ b/test/Directory.Build.targets
@@ -6,4 +6,4 @@
runtime; build; native; contentfiles; analyzers; buildtransitive
-
\ No newline at end of file
+
diff --git a/test/OpenTelemetry.Exporter.Jaeger.Tests/OpenTelemetry.Exporter.Jaeger.Tests.csproj b/test/OpenTelemetry.Exporter.Jaeger.Tests/OpenTelemetry.Exporter.Jaeger.Tests.csproj
index 7446c97a9..bb95fc842 100644
--- a/test/OpenTelemetry.Exporter.Jaeger.Tests/OpenTelemetry.Exporter.Jaeger.Tests.csproj
+++ b/test/OpenTelemetry.Exporter.Jaeger.Tests/OpenTelemetry.Exporter.Jaeger.Tests.csproj
@@ -14,14 +14,14 @@
-
-
-
-
+
+
+
+
all
runtime; build; native; contentfiles; analyzers
-
+
diff --git a/test/OpenTelemetry.Exporter.OpenTelemetryProtocol.Tests/OpenTelemetry.Exporter.OpenTelemetryProtocol.Tests.csproj b/test/OpenTelemetry.Exporter.OpenTelemetryProtocol.Tests/OpenTelemetry.Exporter.OpenTelemetryProtocol.Tests.csproj
index 1196344c4..710cac469 100644
--- a/test/OpenTelemetry.Exporter.OpenTelemetryProtocol.Tests/OpenTelemetry.Exporter.OpenTelemetryProtocol.Tests.csproj
+++ b/test/OpenTelemetry.Exporter.OpenTelemetryProtocol.Tests/OpenTelemetry.Exporter.OpenTelemetryProtocol.Tests.csproj
@@ -7,10 +7,10 @@
-
-
-
-
+
+
+
+
all
runtime; build; native; contentfiles; analyzers; buildtransitive
diff --git a/test/OpenTelemetry.Exporter.Prometheus.Tests/OpenTelemetry.Exporter.Prometheus.Tests.csproj b/test/OpenTelemetry.Exporter.Prometheus.Tests/OpenTelemetry.Exporter.Prometheus.Tests.csproj
index 18f5c7703..1efe21b84 100644
--- a/test/OpenTelemetry.Exporter.Prometheus.Tests/OpenTelemetry.Exporter.Prometheus.Tests.csproj
+++ b/test/OpenTelemetry.Exporter.Prometheus.Tests/OpenTelemetry.Exporter.Prometheus.Tests.csproj
@@ -8,9 +8,9 @@
-
-
-
+
+
+
all
runtime; build; native; contentfiles; analyzers; buildtransitive
diff --git a/test/OpenTelemetry.Exporter.Prometheus.Tests/PrometheusExporterTests.cs b/test/OpenTelemetry.Exporter.Prometheus.Tests/PrometheusExporterTests.cs
index 52633e6d7..80df4e71d 100644
--- a/test/OpenTelemetry.Exporter.Prometheus.Tests/PrometheusExporterTests.cs
+++ b/test/OpenTelemetry.Exporter.Prometheus.Tests/PrometheusExporterTests.cs
@@ -24,7 +24,6 @@ using Microsoft.AspNetCore.Hosting;
using Microsoft.AspNetCore.TestHost;
using Microsoft.Extensions.DependencyInjection;
#endif
-using OpenTelemetry.Metrics;
using OpenTelemetry.Metrics.Export;
using OpenTelemetry.Trace;
using Xunit;
diff --git a/test/OpenTelemetry.Exporter.ZPages.Tests/OpenTelemetry.Exporter.ZPages.Tests.csproj b/test/OpenTelemetry.Exporter.ZPages.Tests/OpenTelemetry.Exporter.ZPages.Tests.csproj
index c8e1353a2..bd321f817 100644
--- a/test/OpenTelemetry.Exporter.ZPages.Tests/OpenTelemetry.Exporter.ZPages.Tests.csproj
+++ b/test/OpenTelemetry.Exporter.ZPages.Tests/OpenTelemetry.Exporter.ZPages.Tests.csproj
@@ -7,9 +7,9 @@
-
-
-
+
+
+
runtime; build; native; contentfiles; analyzers; buildtransitive
all
diff --git a/test/OpenTelemetry.Exporter.ZPages.Tests/ZPagesExporterTests.cs b/test/OpenTelemetry.Exporter.ZPages.Tests/ZPagesExporterTests.cs
index 1eabc86b4..79e55a4e5 100644
--- a/test/OpenTelemetry.Exporter.ZPages.Tests/ZPagesExporterTests.cs
+++ b/test/OpenTelemetry.Exporter.ZPages.Tests/ZPagesExporterTests.cs
@@ -20,7 +20,6 @@ using System.Diagnostics;
using System.Linq;
using System.Threading;
using System.Threading.Tasks;
-using OpenTelemetry;
using OpenTelemetry.Exporter.ZPages.Implementation;
using OpenTelemetry.Resources;
using OpenTelemetry.Trace;
diff --git a/test/OpenTelemetry.Exporter.Zipkin.Tests/Implementation/ZipkinActivityConversionTest.cs b/test/OpenTelemetry.Exporter.Zipkin.Tests/Implementation/ZipkinActivityConversionTest.cs
index 9fa3eaea8..2e3ad3f21 100644
--- a/test/OpenTelemetry.Exporter.Zipkin.Tests/Implementation/ZipkinActivityConversionTest.cs
+++ b/test/OpenTelemetry.Exporter.Zipkin.Tests/Implementation/ZipkinActivityConversionTest.cs
@@ -14,7 +14,6 @@
// limitations under the License.
//
-using System.Diagnostics;
using System.Linq;
using OpenTelemetry.Exporter.Zipkin.Implementation;
using Xunit;
diff --git a/test/OpenTelemetry.Exporter.Zipkin.Tests/OpenTelemetry.Exporter.Zipkin.Tests.csproj b/test/OpenTelemetry.Exporter.Zipkin.Tests/OpenTelemetry.Exporter.Zipkin.Tests.csproj
index 8ba1eae97..f7757c932 100644
--- a/test/OpenTelemetry.Exporter.Zipkin.Tests/OpenTelemetry.Exporter.Zipkin.Tests.csproj
+++ b/test/OpenTelemetry.Exporter.Zipkin.Tests/OpenTelemetry.Exporter.Zipkin.Tests.csproj
@@ -20,14 +20,14 @@
-
-
-
-
+
+
+
+
all
runtime; build; native; contentfiles; analyzers
-
+
diff --git a/test/OpenTelemetry.Extensions.Hosting.Tests/EventSourceTest.cs b/test/OpenTelemetry.Extensions.Hosting.Tests/EventSourceTest.cs
index 53eeea0e3..35a34537a 100644
--- a/test/OpenTelemetry.Extensions.Hosting.Tests/EventSourceTest.cs
+++ b/test/OpenTelemetry.Extensions.Hosting.Tests/EventSourceTest.cs
@@ -14,7 +14,6 @@
// limitations under the License.
//
-using System.Diagnostics.Tracing;
using OpenTelemetry.Extensions.Hosting.Implementation;
using OpenTelemetry.Tests;
using Xunit;
diff --git a/test/OpenTelemetry.Extensions.Hosting.Tests/OpenTelemetry.Extensions.Hosting.Tests.csproj b/test/OpenTelemetry.Extensions.Hosting.Tests/OpenTelemetry.Extensions.Hosting.Tests.csproj
index e417c92ad..56d9087ea 100644
--- a/test/OpenTelemetry.Extensions.Hosting.Tests/OpenTelemetry.Extensions.Hosting.Tests.csproj
+++ b/test/OpenTelemetry.Extensions.Hosting.Tests/OpenTelemetry.Extensions.Hosting.Tests.csproj
@@ -13,14 +13,14 @@
-
-
-
-
+
+
+
+
all
runtime; build; native; contentfiles; analyzers
-
+
-
\ No newline at end of file
+
diff --git a/test/OpenTelemetry.Instrumentation.AspNet.Tests/OpenTelemetry.Instrumentation.AspNet.Tests.csproj b/test/OpenTelemetry.Instrumentation.AspNet.Tests/OpenTelemetry.Instrumentation.AspNet.Tests.csproj
index a04f26513..423e62f09 100644
--- a/test/OpenTelemetry.Instrumentation.AspNet.Tests/OpenTelemetry.Instrumentation.AspNet.Tests.csproj
+++ b/test/OpenTelemetry.Instrumentation.AspNet.Tests/OpenTelemetry.Instrumentation.AspNet.Tests.csproj
@@ -15,14 +15,14 @@
-
-
-
-
+
+
+
+
all
runtime; build; native; contentfiles; analyzers
-
+
diff --git a/test/OpenTelemetry.Instrumentation.AspNetCore.Tests/OpenTelemetry.Instrumentation.AspNetCore.Tests.csproj b/test/OpenTelemetry.Instrumentation.AspNetCore.Tests/OpenTelemetry.Instrumentation.AspNetCore.Tests.csproj
index 7eca0d2fb..a17ce70a3 100644
--- a/test/OpenTelemetry.Instrumentation.AspNetCore.Tests/OpenTelemetry.Instrumentation.AspNetCore.Tests.csproj
+++ b/test/OpenTelemetry.Instrumentation.AspNetCore.Tests/OpenTelemetry.Instrumentation.AspNetCore.Tests.csproj
@@ -15,14 +15,14 @@
-
-
-
-
+
+
+
+
all
runtime; build; native; contentfiles; analyzers
-
+
diff --git a/test/OpenTelemetry.Instrumentation.GrpcClient.Tests/OpenTelemetry.Instrumentation.GrpcClient.Tests.csproj b/test/OpenTelemetry.Instrumentation.GrpcClient.Tests/OpenTelemetry.Instrumentation.GrpcClient.Tests.csproj
index 2008a5ec0..7461c439a 100644
--- a/test/OpenTelemetry.Instrumentation.GrpcClient.Tests/OpenTelemetry.Instrumentation.GrpcClient.Tests.csproj
+++ b/test/OpenTelemetry.Instrumentation.GrpcClient.Tests/OpenTelemetry.Instrumentation.GrpcClient.Tests.csproj
@@ -9,14 +9,14 @@
-
-
-
-
+
+
+
+
all
runtime; build; native; contentfiles; analyzers
-
+
diff --git a/test/OpenTelemetry.Instrumentation.Http.Tests/OpenTelemetry.Instrumentation.Http.Tests.csproj b/test/OpenTelemetry.Instrumentation.Http.Tests/OpenTelemetry.Instrumentation.Http.Tests.csproj
index b20157c95..85ea5282b 100644
--- a/test/OpenTelemetry.Instrumentation.Http.Tests/OpenTelemetry.Instrumentation.Http.Tests.csproj
+++ b/test/OpenTelemetry.Instrumentation.Http.Tests/OpenTelemetry.Instrumentation.Http.Tests.csproj
@@ -24,16 +24,16 @@
-
-
-
-
+
+
+
+
all
runtime; build; native; contentfiles; analyzers
-
-
+
+
diff --git a/test/OpenTelemetry.Instrumentation.SqlClient.Tests/OpenTelemetry.Instrumentation.SqlClient.Tests.csproj b/test/OpenTelemetry.Instrumentation.SqlClient.Tests/OpenTelemetry.Instrumentation.SqlClient.Tests.csproj
index 957a81afd..4d3c3e593 100644
--- a/test/OpenTelemetry.Instrumentation.SqlClient.Tests/OpenTelemetry.Instrumentation.SqlClient.Tests.csproj
+++ b/test/OpenTelemetry.Instrumentation.SqlClient.Tests/OpenTelemetry.Instrumentation.SqlClient.Tests.csproj
@@ -23,16 +23,16 @@
-
-
-
-
+
+
+
+
all
runtime; build; native; contentfiles; analyzers
-
-
+
+
diff --git a/test/OpenTelemetry.Instrumentation.SqlClient.Tests/SqlClientInstrumentationOptionsTests.cs b/test/OpenTelemetry.Instrumentation.SqlClient.Tests/SqlClientInstrumentationOptionsTests.cs
index 3e79ffe0b..e96cb6c31 100644
--- a/test/OpenTelemetry.Instrumentation.SqlClient.Tests/SqlClientInstrumentationOptionsTests.cs
+++ b/test/OpenTelemetry.Instrumentation.SqlClient.Tests/SqlClientInstrumentationOptionsTests.cs
@@ -16,7 +16,6 @@
using System.Diagnostics;
using System.Linq;
-using Moq;
using OpenTelemetry.Trace;
using Xunit;
diff --git a/test/OpenTelemetry.Instrumentation.SqlClient.Tests/SqlClientTests.cs b/test/OpenTelemetry.Instrumentation.SqlClient.Tests/SqlClientTests.cs
index 5b37637f9..f39fb04c5 100644
--- a/test/OpenTelemetry.Instrumentation.SqlClient.Tests/SqlClientTests.cs
+++ b/test/OpenTelemetry.Instrumentation.SqlClient.Tests/SqlClientTests.cs
@@ -18,7 +18,6 @@ using System;
using System.Data;
using System.Diagnostics;
using System.Linq;
-using System.Threading.Tasks;
#if NET452
using System.Data.SqlClient;
#else
diff --git a/test/OpenTelemetry.Instrumentation.StackExchangeRedis.Tests/OpenTelemetry.Instrumentation.StackExchangeRedis.Tests.csproj b/test/OpenTelemetry.Instrumentation.StackExchangeRedis.Tests/OpenTelemetry.Instrumentation.StackExchangeRedis.Tests.csproj
index 1ee8258b6..9ffd01f87 100644
--- a/test/OpenTelemetry.Instrumentation.StackExchangeRedis.Tests/OpenTelemetry.Instrumentation.StackExchangeRedis.Tests.csproj
+++ b/test/OpenTelemetry.Instrumentation.StackExchangeRedis.Tests/OpenTelemetry.Instrumentation.StackExchangeRedis.Tests.csproj
@@ -15,13 +15,13 @@
-
-
-
-
+
+
+
+
all
runtime; build; native; contentfiles; analyzers
-
+
-
\ No newline at end of file
+
diff --git a/test/OpenTelemetry.Shims.OpenTracing.Tests/OpenTelemetry.Shims.OpenTracing.Tests.csproj b/test/OpenTelemetry.Shims.OpenTracing.Tests/OpenTelemetry.Shims.OpenTracing.Tests.csproj
index d1f05453d..121cb0d01 100644
--- a/test/OpenTelemetry.Shims.OpenTracing.Tests/OpenTelemetry.Shims.OpenTracing.Tests.csproj
+++ b/test/OpenTelemetry.Shims.OpenTracing.Tests/OpenTelemetry.Shims.OpenTracing.Tests.csproj
@@ -5,14 +5,14 @@
-
-
-
-
+
+
+
+
all
runtime; build; native; contentfiles; analyzers
-
+
diff --git a/test/OpenTelemetry.Tests/Implementation/Metrics/CounterCleanUpTests.cs b/test/OpenTelemetry.Tests/Implementation/Metrics/CounterCleanUpTests.cs
index 3787993c7..c25ece445 100644
--- a/test/OpenTelemetry.Tests/Implementation/Metrics/CounterCleanUpTests.cs
+++ b/test/OpenTelemetry.Tests/Implementation/Metrics/CounterCleanUpTests.cs
@@ -17,7 +17,6 @@
using System;
using System.Collections.Generic;
using System.Threading;
-using OpenTelemetry.Metrics;
using OpenTelemetry.Metrics.Export;
using OpenTelemetry.Trace;
using Xunit;
diff --git a/test/OpenTelemetry.Tests/Implementation/Metrics/MeterProviderTests.cs b/test/OpenTelemetry.Tests/Implementation/Metrics/MeterProviderTests.cs
index f4644113f..606ce2664 100644
--- a/test/OpenTelemetry.Tests/Implementation/Metrics/MeterProviderTests.cs
+++ b/test/OpenTelemetry.Tests/Implementation/Metrics/MeterProviderTests.cs
@@ -15,8 +15,6 @@
//
using System;
-using OpenTelemetry.Metrics;
-using OpenTelemetry.Trace;
using Xunit;
namespace OpenTelemetry.Metrics.Config.Test
diff --git a/test/OpenTelemetry.Tests/Implementation/Metrics/MetricsTest.cs b/test/OpenTelemetry.Tests/Implementation/Metrics/MetricsTest.cs
index 5b07cbf78..e96b83ca0 100644
--- a/test/OpenTelemetry.Tests/Implementation/Metrics/MetricsTest.cs
+++ b/test/OpenTelemetry.Tests/Implementation/Metrics/MetricsTest.cs
@@ -16,7 +16,6 @@
using System.Collections.Generic;
using System.Linq;
-using OpenTelemetry.Metrics;
using OpenTelemetry.Metrics.Export;
using OpenTelemetry.Trace;
using Xunit;
diff --git a/test/OpenTelemetry.Tests/Implementation/Trace/ActivityExtensionsTest.cs b/test/OpenTelemetry.Tests/Implementation/Trace/ActivityExtensionsTest.cs
index 3b5371e11..a2c0d299b 100644
--- a/test/OpenTelemetry.Tests/Implementation/Trace/ActivityExtensionsTest.cs
+++ b/test/OpenTelemetry.Tests/Implementation/Trace/ActivityExtensionsTest.cs
@@ -14,9 +14,7 @@
// limitations under the License.
//
-using System;
using System.Diagnostics;
-using OpenTelemetry.Trace;
using Xunit;
namespace OpenTelemetry.Trace.Test
diff --git a/test/OpenTelemetry.Tests/Implementation/Trace/CurrentSpanTests.cs b/test/OpenTelemetry.Tests/Implementation/Trace/CurrentSpanTests.cs
index 87b5a3699..b71fa50d4 100644
--- a/test/OpenTelemetry.Tests/Implementation/Trace/CurrentSpanTests.cs
+++ b/test/OpenTelemetry.Tests/Implementation/Trace/CurrentSpanTests.cs
@@ -16,8 +16,6 @@
using System;
using System.Diagnostics;
-using OpenTelemetry.Internal;
-using OpenTelemetry.Trace;
using Xunit;
namespace OpenTelemetry.Trace.Test
diff --git a/test/OpenTelemetry.Tests/Implementation/Trace/Export/SimpleActivityProcessorTest.cs b/test/OpenTelemetry.Tests/Implementation/Trace/Export/SimpleActivityProcessorTest.cs
index b9914a34a..e7f5f98a5 100644
--- a/test/OpenTelemetry.Tests/Implementation/Trace/Export/SimpleActivityProcessorTest.cs
+++ b/test/OpenTelemetry.Tests/Implementation/Trace/Export/SimpleActivityProcessorTest.cs
@@ -19,7 +19,6 @@ using System.Diagnostics;
using System.Threading;
using System.Threading.Tasks;
using OpenTelemetry.Testing.Export;
-using OpenTelemetry.Trace;
using OpenTelemetry.Trace.Samplers;
using Xunit;
diff --git a/test/OpenTelemetry.Tests/Implementation/Trace/Propagation/B3FormatTest.cs b/test/OpenTelemetry.Tests/Implementation/Trace/Propagation/B3FormatTest.cs
index eb5e6e6e2..c4075c716 100644
--- a/test/OpenTelemetry.Tests/Implementation/Trace/Propagation/B3FormatTest.cs
+++ b/test/OpenTelemetry.Tests/Implementation/Trace/Propagation/B3FormatTest.cs
@@ -16,7 +16,6 @@
using System;
using System.Collections.Generic;
using System.Diagnostics;
-using OpenTelemetry.Trace;
using Xunit;
using Xunit.Abstractions;
diff --git a/test/OpenTelemetry.Tests/Implementation/Trace/Propagation/TraceContextTest.cs b/test/OpenTelemetry.Tests/Implementation/Trace/Propagation/TraceContextTest.cs
index f9beea3b8..9b2a2aefd 100644
--- a/test/OpenTelemetry.Tests/Implementation/Trace/Propagation/TraceContextTest.cs
+++ b/test/OpenTelemetry.Tests/Implementation/Trace/Propagation/TraceContextTest.cs
@@ -16,7 +16,6 @@
using System;
using System.Collections.Generic;
using System.Diagnostics;
-using System.Linq;
using OpenTelemetry.Context.Propagation;
using Xunit;
diff --git a/test/OpenTelemetry.Tests/Implementation/Trace/Samplers/ParentOrElseSamplerTests.cs b/test/OpenTelemetry.Tests/Implementation/Trace/Samplers/ParentOrElseSamplerTests.cs
index db082bf8c..cedf76728 100644
--- a/test/OpenTelemetry.Tests/Implementation/Trace/Samplers/ParentOrElseSamplerTests.cs
+++ b/test/OpenTelemetry.Tests/Implementation/Trace/Samplers/ParentOrElseSamplerTests.cs
@@ -13,8 +13,6 @@
// See the License for the specific language governing permissions and
// limitations under the License.
//
-using System;
-using System.Collections.Generic;
using System.Diagnostics;
using Xunit;
diff --git a/test/OpenTelemetry.Tests/InMemoryEventListener.cs b/test/OpenTelemetry.Tests/InMemoryEventListener.cs
index 9282bee08..94fdebd8b 100644
--- a/test/OpenTelemetry.Tests/InMemoryEventListener.cs
+++ b/test/OpenTelemetry.Tests/InMemoryEventListener.cs
@@ -14,11 +14,8 @@
// limitations under the License.
//
-using System;
using System.Collections.Concurrent;
-using System.Collections.Generic;
using System.Diagnostics.Tracing;
-using System.Text;
using OpenTelemetry.Internal;
namespace OpenTelemetry.Tests
diff --git a/test/OpenTelemetry.Tests/OpenTelemetry.Tests.csproj b/test/OpenTelemetry.Tests/OpenTelemetry.Tests.csproj
index 61b66f210..4cd381b16 100644
--- a/test/OpenTelemetry.Tests/OpenTelemetry.Tests.csproj
+++ b/test/OpenTelemetry.Tests/OpenTelemetry.Tests.csproj
@@ -16,13 +16,13 @@
-
-
-
-
+
+
+
+
all
runtime; build; native; contentfiles; analyzers
-
+
-
\ No newline at end of file
+