diff --git a/.github/workflows/integration.yml b/.github/workflows/integration.yml
index 1f56beff642..f82872602d2 100644
--- a/.github/workflows/integration.yml
+++ b/.github/workflows/integration.yml
@@ -16,7 +16,7 @@ jobs:
strategy:
fail-fast: false
matrix:
- version: [netcoreapp3.1,net5.0,net6.0]
+ version: [netcoreapp3.1,net6.0]
steps:
- uses: actions/checkout@v3
@@ -28,7 +28,7 @@ jobs:
strategy:
fail-fast: false
matrix:
- version: [netcoreapp3.1,net5.0,net6.0]
+ version: [netcoreapp3.1,net6.0]
steps:
- uses: actions/checkout@v3
@@ -40,7 +40,7 @@ jobs:
strategy:
fail-fast: false
matrix:
- version: [netcoreapp3.1,net5.0,net6.0]
+ version: [netcoreapp3.1,net6.0]
steps:
- uses: actions/checkout@v3
@@ -52,7 +52,7 @@ jobs:
strategy:
fail-fast: false
matrix:
- version: [netcoreapp3.1,net5.0,net6.0]
+ version: [netcoreapp3.1,net6.0]
steps:
- uses: actions/checkout@v3
diff --git a/.github/workflows/linux-ci.yml b/.github/workflows/linux-ci.yml
index e2927ea5710..2768651bb2e 100644
--- a/.github/workflows/linux-ci.yml
+++ b/.github/workflows/linux-ci.yml
@@ -16,7 +16,7 @@ jobs:
strategy:
matrix:
- version: [netcoreapp3.1,net5.0,net6.0]
+ version: [netcoreapp3.1,net6.0]
steps:
- uses: actions/checkout@v3
diff --git a/.github/workflows/windows-ci.yml b/.github/workflows/windows-ci.yml
index 9a630b7122c..7427cc2dd2b 100644
--- a/.github/workflows/windows-ci.yml
+++ b/.github/workflows/windows-ci.yml
@@ -16,7 +16,7 @@ jobs:
strategy:
matrix:
- version: [net462,netcoreapp3.1,net5.0,net6.0]
+ version: [net462,netcoreapp3.1,net6.0]
steps:
- uses: actions/checkout@v3
diff --git a/docs/Directory.Build.props b/docs/Directory.Build.props
index 3b32735d1c2..66de939828d 100644
--- a/docs/Directory.Build.props
+++ b/docs/Directory.Build.props
@@ -5,7 +5,7 @@
Exe
- net6.0;net5.0;netcoreapp3.1
+ net6.0;netcoreapp3.1
$(TargetFrameworks);net462;net47;net471;net472;net48
diff --git a/src/OpenTelemetry.Exporter.ZPages/.publicApi/net461/PublicAPI.Shipped.txt b/src/OpenTelemetry.Exporter.ZPages/.publicApi/net462/PublicAPI.Shipped.txt
similarity index 100%
rename from src/OpenTelemetry.Exporter.ZPages/.publicApi/net461/PublicAPI.Shipped.txt
rename to src/OpenTelemetry.Exporter.ZPages/.publicApi/net462/PublicAPI.Shipped.txt
diff --git a/src/OpenTelemetry.Exporter.ZPages/.publicApi/net461/PublicAPI.Unshipped.txt b/src/OpenTelemetry.Exporter.ZPages/.publicApi/net462/PublicAPI.Unshipped.txt
similarity index 100%
rename from src/OpenTelemetry.Exporter.ZPages/.publicApi/net461/PublicAPI.Unshipped.txt
rename to src/OpenTelemetry.Exporter.ZPages/.publicApi/net462/PublicAPI.Unshipped.txt
diff --git a/src/OpenTelemetry.Exporter.ZPages/CHANGELOG.md b/src/OpenTelemetry.Exporter.ZPages/CHANGELOG.md
index 33546286c80..b0c8dc1b431 100644
--- a/src/OpenTelemetry.Exporter.ZPages/CHANGELOG.md
+++ b/src/OpenTelemetry.Exporter.ZPages/CHANGELOG.md
@@ -2,6 +2,9 @@
## Unreleased
+* Removes .NET Framework 4.6.1. The minimum .NET Framework
+ version supported is .NET 4.6.2. ([#3190](https://github.com/open-telemetry/opentelemetry-dotnet/issues/3190))
+
## 1.0.0-rc9.3
Released 2022-Apr-15
diff --git a/src/OpenTelemetry.Exporter.ZPages/OpenTelemetry.Exporter.ZPages.csproj b/src/OpenTelemetry.Exporter.ZPages/OpenTelemetry.Exporter.ZPages.csproj
index 971b3baae77..cb07633dde3 100644
--- a/src/OpenTelemetry.Exporter.ZPages/OpenTelemetry.Exporter.ZPages.csproj
+++ b/src/OpenTelemetry.Exporter.ZPages/OpenTelemetry.Exporter.ZPages.csproj
@@ -1,8 +1,8 @@
-
+
- netstandard2.0;net461
+ netstandard2.0;net462
ZPages exporter for OpenTelemetry .NET
$(PackageTags);ZPages;distributed-tracing
diff --git a/test/Benchmarks/Benchmarks.csproj b/test/Benchmarks/Benchmarks.csproj
index 683b5ef43ae..12e759d9f1c 100644
--- a/test/Benchmarks/Benchmarks.csproj
+++ b/test/Benchmarks/Benchmarks.csproj
@@ -3,7 +3,7 @@
Exe
- net6.0;net5.0;netcoreapp3.1;net462
+ net6.0;netcoreapp3.1;net462
false
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 a3f4f8a02f1..cbed29404a7 100644
--- a/test/OpenTelemetry.Exporter.Prometheus.Tests/OpenTelemetry.Exporter.Prometheus.Tests.csproj
+++ b/test/OpenTelemetry.Exporter.Prometheus.Tests/OpenTelemetry.Exporter.Prometheus.Tests.csproj
@@ -2,7 +2,7 @@
Unit test project for Prometheus Exporter for OpenTelemetry
- net6.0;net5.0;netcoreapp3.1
+ net6.0;netcoreapp3.1
$(TargetFrameworks);net462
false
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 b7a16963ac7..46a3ef71009 100644
--- a/test/OpenTelemetry.Exporter.ZPages.Tests/OpenTelemetry.Exporter.ZPages.Tests.csproj
+++ b/test/OpenTelemetry.Exporter.ZPages.Tests/OpenTelemetry.Exporter.ZPages.Tests.csproj
@@ -1,9 +1,9 @@
-
+
- net6.0;net5.0;netcoreapp3.1
- $(TargetFrameworks);net461
+ net6.0;netcoreapp3.1
+ $(TargetFrameworks);net462
false
@@ -23,7 +23,7 @@
-
+
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 94e9444da31..95b8de049a2 100644
--- a/test/OpenTelemetry.Extensions.Hosting.Tests/OpenTelemetry.Extensions.Hosting.Tests.csproj
+++ b/test/OpenTelemetry.Extensions.Hosting.Tests/OpenTelemetry.Extensions.Hosting.Tests.csproj
@@ -2,7 +2,7 @@
Unit test project for OpenTelemetry .NET Core hosting library
- net6.0;net5.0;netcoreapp3.1
+ net6.0;netcoreapp3.1
$(TargetFrameworks);net462
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 5a631bb5a53..a38f1a99cba 100644
--- a/test/OpenTelemetry.Instrumentation.Http.Tests/OpenTelemetry.Instrumentation.Http.Tests.csproj
+++ b/test/OpenTelemetry.Instrumentation.Http.Tests/OpenTelemetry.Instrumentation.Http.Tests.csproj
@@ -2,7 +2,7 @@
Unit test project for OpenTelemetry HTTP instrumentations
- net6.0;net5.0;netcoreapp3.1
+ net6.0;netcoreapp3.1
$(TargetFrameworks);net462
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 d5294f74346..d38abed9956 100644
--- a/test/OpenTelemetry.Instrumentation.SqlClient.Tests/OpenTelemetry.Instrumentation.SqlClient.Tests.csproj
+++ b/test/OpenTelemetry.Instrumentation.SqlClient.Tests/OpenTelemetry.Instrumentation.SqlClient.Tests.csproj
@@ -2,7 +2,7 @@
Unit test project for OpenTelemetry SqlClient instrumentations
- net6.0;net5.0;netcoreapp3.1
+ net6.0;netcoreapp3.1
$(TargetFrameworks);net462
$(TARGET_FRAMEWORK)
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 6ac19a755de..4d80417bab2 100644
--- a/test/OpenTelemetry.Instrumentation.StackExchangeRedis.Tests/OpenTelemetry.Instrumentation.StackExchangeRedis.Tests.csproj
+++ b/test/OpenTelemetry.Instrumentation.StackExchangeRedis.Tests/OpenTelemetry.Instrumentation.StackExchangeRedis.Tests.csproj
@@ -2,7 +2,7 @@
Unit test project for OpenTelemetry StackExchangeRedis instrumentation
- net6.0;net5.0;netcoreapp3.1
+ net6.0;netcoreapp3.1
$(TargetFrameworks);net462
$(TARGET_FRAMEWORK)
diff --git a/test/OpenTelemetry.Instrumentation.W3cTraceContext.Tests/OpenTelemetry.Instrumentation.W3cTraceContext.Tests.csproj b/test/OpenTelemetry.Instrumentation.W3cTraceContext.Tests/OpenTelemetry.Instrumentation.W3cTraceContext.Tests.csproj
index fad7ce3bf04..9999ea27164 100644
--- a/test/OpenTelemetry.Instrumentation.W3cTraceContext.Tests/OpenTelemetry.Instrumentation.W3cTraceContext.Tests.csproj
+++ b/test/OpenTelemetry.Instrumentation.W3cTraceContext.Tests/OpenTelemetry.Instrumentation.W3cTraceContext.Tests.csproj
@@ -1,9 +1,9 @@
-
+
Unit test project for OpenTelemetry ASP.NET Core instrumentation for W3C Trace Context Trace
- net6.0;net5.0;netcoreapp3.1
+ net6.0;netcoreapp3.1
$(TARGET_FRAMEWORK)
@@ -33,10 +33,6 @@
-
-
-
-
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 0ccecfbaffe..478fc22c730 100644
--- a/test/OpenTelemetry.Shims.OpenTracing.Tests/OpenTelemetry.Shims.OpenTracing.Tests.csproj
+++ b/test/OpenTelemetry.Shims.OpenTracing.Tests/OpenTelemetry.Shims.OpenTracing.Tests.csproj
@@ -1,8 +1,8 @@
-
+
Unit test project for OpenTelemetry.Shims.OpenTracing
- net6.0;net5.0;netcoreapp3.1
+ net6.0;netcoreapp3.1
diff --git a/test/OpenTelemetry.Tests.Stress.Metrics/OpenTelemetry.Tests.Stress.Metrics.csproj b/test/OpenTelemetry.Tests.Stress.Metrics/OpenTelemetry.Tests.Stress.Metrics.csproj
index 8171033131f..97d1f438292 100644
--- a/test/OpenTelemetry.Tests.Stress.Metrics/OpenTelemetry.Tests.Stress.Metrics.csproj
+++ b/test/OpenTelemetry.Tests.Stress.Metrics/OpenTelemetry.Tests.Stress.Metrics.csproj
@@ -3,7 +3,7 @@
Exe
- net6.0;net5.0;netcoreapp3.1;net462
+ net6.0;netcoreapp3.1;net462
false
diff --git a/test/OpenTelemetry.Tests.Stress/OpenTelemetry.Tests.Stress.csproj b/test/OpenTelemetry.Tests.Stress/OpenTelemetry.Tests.Stress.csproj
index e1725d4d80c..31166433f8c 100644
--- a/test/OpenTelemetry.Tests.Stress/OpenTelemetry.Tests.Stress.csproj
+++ b/test/OpenTelemetry.Tests.Stress/OpenTelemetry.Tests.Stress.csproj
@@ -1,8 +1,8 @@
-
+
Exe
- net6.0;net5.0;netcoreapp3.1;net462
+ net6.0;netcoreapp3.1;net462
false
diff --git a/test/OpenTelemetry.Tests/OpenTelemetry.Tests.csproj b/test/OpenTelemetry.Tests/OpenTelemetry.Tests.csproj
index 531466ed928..8d1c69f4f50 100644
--- a/test/OpenTelemetry.Tests/OpenTelemetry.Tests.csproj
+++ b/test/OpenTelemetry.Tests/OpenTelemetry.Tests.csproj
@@ -2,7 +2,7 @@
Unit test project for OpenTelemetry
- net6.0;net5.0;netcoreapp3.1
+ net6.0;netcoreapp3.1
$(TargetFrameworks);net462
$(NoWarn),CS0618