diff --git a/.github/workflows/Component.BuildTest.yml b/.github/workflows/Component.BuildTest.yml index f5ef85e0dc..df07949845 100644 --- a/.github/workflows/Component.BuildTest.yml +++ b/.github/workflows/Component.BuildTest.yml @@ -24,7 +24,7 @@ on: required: false type: string tfm-list: - default: '[ "net462", "net6.0", "net7.0", "net8.0" ]' + default: '[ "net462", "net6.0", "net8.0" ]' required: false type: string diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 7f222b07cc..be3cdf11ab 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -111,7 +111,7 @@ jobs: strategy: fail-fast: false matrix: - version: [ net6.0, net7.0, net8.0 ] + version: [ net6.0, net8.0 ] steps: - uses: actions/checkout@v4 - name: Run OTLP Exporter docker compose @@ -129,7 +129,7 @@ jobs: strategy: fail-fast: false matrix: - version: [ net6.0, net7.0 ] + version: [ net6.0 ] steps: - uses: actions/checkout@v4 - name: Run W3C Trace Context docker compose diff --git a/Directory.Packages.props b/Directory.Packages.props index f15e90b0d9..bfe09403ee 100644 --- a/Directory.Packages.props +++ b/Directory.Packages.props @@ -100,9 +100,6 @@ - - - diff --git a/OpenTelemetry.sln b/OpenTelemetry.sln index c7b07b3a5d..fd7cdb94f1 100644 --- a/OpenTelemetry.sln +++ b/OpenTelemetry.sln @@ -32,7 +32,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "build", "build", "{7CB2F02E Directory.Packages.props = Directory.Packages.props build\docfx.cmd = build\docfx.cmd build\docker-compose.net6.0.yml = build\docker-compose.net6.0.yml - build\docker-compose.net7.0.yml = build\docker-compose.net7.0.yml build\docker-compose.net8.0.yml = build\docker-compose.net8.0.yml build\GlobalAttrExclusions.txt = build\GlobalAttrExclusions.txt build\opentelemetry-icon-color.png = build\opentelemetry-icon-color.png diff --git a/build/Common.props b/build/Common.props index e3b2c19824..e526f543e9 100644 --- a/build/Common.props +++ b/build/Common.props @@ -31,13 +31,13 @@ net8.0;net6.0 - net8.0;net7.0;net6.0 + net8.0;net6.0 net8.0 - net8.0;net7.0;net6.0 + net8.0;net6.0 $(TargetFrameworksForDocs);$(NetFrameworkSupportedVersions) - net8.0;net7.0;net6.0 + net8.0;net6.0 $(TargetFrameworksForTests);$(NetFrameworkMinimumSupportedVersion) diff --git a/build/docker-compose.net7.0.yml b/build/docker-compose.net7.0.yml deleted file mode 100644 index 48a2589cda..0000000000 --- a/build/docker-compose.net7.0.yml +++ /dev/null @@ -1,9 +0,0 @@ -version: '3.7' - -services: - tests: - build: - args: - PUBLISH_FRAMEWORK: net7.0 - TEST_SDK_VERSION: "7.0" - BUILD_SDK_VERSION: "8.0"