From 1d30f53d56b8134bf51a9f1b0cd4360ec8025d44 Mon Sep 17 00:00:00 2001 From: Naomi Carrigan Date: Tue, 28 Jan 2025 13:54:41 -0800 Subject: [PATCH] feat!: drop support for dotnet 6 and 7 --- .devcontainer/Dockerfile | 2 +- .devcontainer/devcontainer.json | 2 +- .github/CODE_CONTRIBUTIONS_GUIDE.md | 4 +- .github/workflows/CD-dev.yml | 2 +- .github/workflows/CD.yml | 2 +- .github/workflows/CI.yml | 2 +- .../Deepgram.Microphone.csproj | 57 +++---------------- Deepgram.Tests/Deepgram.Tests.csproj | 2 +- Deepgram/Deepgram.csproj | 56 +++--------------- Deepgram/README.md | 2 - README.md | 2 - examples/analyze/intent/Analyze.csproj | 2 +- examples/analyze/sentiment/Analyze.csproj | 2 +- examples/analyze/summary/Analyze.csproj | 2 +- examples/analyze/topic/Analyze.csproj | 2 +- examples/manage/balances/Manage.csproj | 2 +- examples/manage/invitations/Manage.csproj | 2 +- examples/manage/keys/Manage.csproj | 2 +- examples/manage/members/Manage.csproj | 2 +- examples/manage/models/Models.csproj | 2 +- examples/manage/projects/Manage.csproj | 2 +- examples/manage/scopes/Manage.csproj | 2 +- examples/manage/usage/Manage.csproj | 2 +- .../rest/file/PreRecorded.csproj | 2 +- .../rest/intent/PreRecorded.csproj | 2 +- .../rest/sentiment/PreRecorded.csproj | 2 +- .../rest/summary/PreRecorded.csproj | 2 +- .../rest/topic/PreRecorded.csproj | 2 +- .../rest/url/PreRecorded.csproj | 2 +- .../websocket/file/Streaming.csproj | 2 +- .../websocket/http/Streaming.csproj | 2 +- .../websocket/microphone/Streaming.csproj | 2 +- .../rest/file/hello-world/Speak.csproj | 2 +- .../rest/file/woodchuck/Speak.csproj | 2 +- .../websocket/simple/Speak.csproj | 2 +- tests/edge_cases/keepalive/KeepAlive.csproj | 2 +- .../ReconnectStreaming.csproj | 2 +- .../string_parsing/StringParsing.csproj | 2 +- .../stt_v1_client_example/Streaming.csproj | 2 +- .../tts_v1_client_example/Speak.csproj | 2 +- .../rest/bad_host/BadHost.csproj | 2 +- .../throw_exception/ThrowException.csproj | 2 +- .../rest/trigger_cancel/TriggerCancel.csproj | 2 +- .../exercise_timeout/ExerciseTimeout.csproj | 2 +- 44 files changed, 57 insertions(+), 142 deletions(-) diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile index 790fa1fa..00d1b61d 100644 --- a/.devcontainer/Dockerfile +++ b/.devcontainer/Dockerfile @@ -1,7 +1,7 @@ # See here for image contents: https://github.com/microsoft/vscode-dev-containers/tree/v0.218.0/containers/dotnet/.devcontainer/base.Dockerfile # [Choice] .NET version: 6.0, 5.0, 3.1, 6.0-bullseye, 5.0-bullseye, 3.1-bullseye, 6.0-focal, 5.0-focal, 3.1-focal -ARG VARIANT="6.0-bullseye-slim" +ARG VARIANT="8.0" FROM mcr.microsoft.com/vscode/devcontainers/dotnet:0-${VARIANT} # [Choice] Node.js version: none, lts/*, 16, 14, 12, 10 diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json index 8b1d504a..dbe4e518 100644 --- a/.devcontainer/devcontainer.json +++ b/.devcontainer/devcontainer.json @@ -7,7 +7,7 @@ "args": { // Update 'VARIANT' to pick a .NET Core version: 3.1, 5.0, 6.0 // Append -bullseye or -focal to pin to an OS version. - "VARIANT": "7.0", + "VARIANT": "8.0", // Options "NODE_VERSION": "none" } diff --git a/.github/CODE_CONTRIBUTIONS_GUIDE.md b/.github/CODE_CONTRIBUTIONS_GUIDE.md index 895c445c..f3889d7e 100644 --- a/.github/CODE_CONTRIBUTIONS_GUIDE.md +++ b/.github/CODE_CONTRIBUTIONS_GUIDE.md @@ -103,7 +103,7 @@ For macOS, there are two options. The recommended option is [Visual Studio Code] **NOTE:** By default, we target the oldest support .NET for the projects contained within this repo. This is done to ensure we are using something other than functionality that is supported at a later version and onward. To target the specific .NET that you downloaded (for example, .NET 8), run the following commands from the root of the repo: ```bash -find ./ -type f -iname "*.csproj" -not -path "./.git" -exec sed -i.bak 's/net6.0<\/TargetFramework>/net8.0<\/TargetFramework>/g' "{}" +; +find ./ -type f -iname "*.csproj" -not -path "./.git" -exec sed -i.bak 's/net8.0<\/TargetFramework>/net8.0<\/TargetFramework>/g' "{}" +; # if you are comfortable with what was changed, you can delete the backup files by running this command # find ./ -type f -iname "*.bak" -not -path "./.git" -exec rm -rf "{}" +; ``` @@ -161,7 +161,7 @@ All Linux distributions have the GNU tools available. The most popular distribut **NOTE:** By default we target the oldest support .NET in the projects contained within this repo. This is done to ensure we are using something other than functionality supported at a later version and onward. To target the specific .NET that you downloaded (for example, .NET 8), run the following commands from the root of the repo: ```bash -find ./ -type f -iname "*.csproj" -not -path "./.git" -exec sed -i.bak 's/net6.0<\/TargetFramework>/net8.0<\/TargetFramework>/g' "{}" +; +find ./ -type f -iname "*.csproj" -not -path "./.git" -exec sed -i.bak 's/net8.0<\/TargetFramework>/net8.0<\/TargetFramework>/g' "{}" +; # if you are comfortable with what was changed, you can delete the backup files by running this command # find ./ -type f -iname "*.bak" -not -path "./.git" -exec rm -rf "{}" +; ``` diff --git a/.github/workflows/CD-dev.yml b/.github/workflows/CD-dev.yml index 80d64eb0..5bae2b81 100644 --- a/.github/workflows/CD-dev.yml +++ b/.github/workflows/CD-dev.yml @@ -15,7 +15,7 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - dotnet-version: ["6.0.x", "7.0.x","8.0.x"] + dotnet-version: ["8.0.x"] steps: - uses: actions/checkout@v2 diff --git a/.github/workflows/CD.yml b/.github/workflows/CD.yml index be578a82..4da69baf 100644 --- a/.github/workflows/CD.yml +++ b/.github/workflows/CD.yml @@ -12,7 +12,7 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - dotnet-version: ["6.0.x", "7.0.x","8.0.x"] + dotnet-version: ["8.0.x"] steps: - uses: actions/checkout@v2 diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml index c00dadd7..29d46807 100644 --- a/.github/workflows/CI.yml +++ b/.github/workflows/CI.yml @@ -13,7 +13,7 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - dotnet-version: ["6.0.x", "7.0.x","8.0.x"] + dotnet-version: ["8.0.x"] steps: - uses: actions/checkout@v2 diff --git a/Deepgram.Microphone/Deepgram.Microphone.csproj b/Deepgram.Microphone/Deepgram.Microphone.csproj index 1c93a2e5..46c883dc 100644 --- a/Deepgram.Microphone/Deepgram.Microphone.csproj +++ b/Deepgram.Microphone/Deepgram.Microphone.csproj @@ -1,7 +1,7 @@  - net6.0;net7.0;net8.0;netstandard2.0 + net8.0;netstandard2.0 enable enable latest @@ -55,59 +55,19 @@ 7 - - 7 - - - 7 - - - 7 - - - 7 - - + runtime; build; native; contentfiles; analyzers; buildtransitive all - - - - + + + + - - - - - - - runtime; build; native; contentfiles; analyzers; buildtransitive - all - - - - - - - - - - - - - runtime; build; native; contentfiles; analyzers; buildtransitive - all - - - - - - - - + + @@ -123,7 +83,6 @@ - diff --git a/Deepgram.Tests/Deepgram.Tests.csproj b/Deepgram.Tests/Deepgram.Tests.csproj index 88d9ec50..0065981e 100644 --- a/Deepgram.Tests/Deepgram.Tests.csproj +++ b/Deepgram.Tests/Deepgram.Tests.csproj @@ -1,7 +1,7 @@  - net6.0 + net8.0 enable enable false diff --git a/Deepgram/Deepgram.csproj b/Deepgram/Deepgram.csproj index 8a43f9ea..a4126885 100644 --- a/Deepgram/Deepgram.csproj +++ b/Deepgram/Deepgram.csproj @@ -1,7 +1,7 @@  - net6.0;net7.0;net8.0;netstandard2.0 + net8.0;netstandard2.0 enable enable latest @@ -55,59 +55,19 @@ 7 - - 7 - - - 7 - - - 7 - - - 7 - - + runtime; build; native; contentfiles; analyzers; buildtransitive all - - - - + + + + - - - - - - - runtime; build; native; contentfiles; analyzers; buildtransitive - all - - - - - - - - - - - - - runtime; build; native; contentfiles; analyzers; buildtransitive - all - - - - - - - - + + diff --git a/Deepgram/README.md b/Deepgram/README.md index 1b914721..b0ebc249 100644 --- a/Deepgram/README.md +++ b/Deepgram/README.md @@ -95,8 +95,6 @@ Right click on project and select manage nuget packages # Targeted Frameworks - 8.0.x -- 7.0.x -- 6.0.x - NetStandard2.0 diff --git a/README.md b/README.md index a7f49f8b..00d7ba20 100644 --- a/README.md +++ b/README.md @@ -35,8 +35,6 @@ You can learn more about the full Deepgram API at [https://developers.deepgram.c This SDK supports the following versions: - .NET 8.0 -- .NET 7.0 -- .NET 6.0 # Installation diff --git a/examples/analyze/intent/Analyze.csproj b/examples/analyze/intent/Analyze.csproj index d0ea3e2e..2d982838 100644 --- a/examples/analyze/intent/Analyze.csproj +++ b/examples/analyze/intent/Analyze.csproj @@ -2,7 +2,7 @@ Exe - net6.0 + net8.0 enable enable diff --git a/examples/analyze/sentiment/Analyze.csproj b/examples/analyze/sentiment/Analyze.csproj index d0ea3e2e..2d982838 100644 --- a/examples/analyze/sentiment/Analyze.csproj +++ b/examples/analyze/sentiment/Analyze.csproj @@ -2,7 +2,7 @@ Exe - net6.0 + net8.0 enable enable diff --git a/examples/analyze/summary/Analyze.csproj b/examples/analyze/summary/Analyze.csproj index d0ea3e2e..2d982838 100644 --- a/examples/analyze/summary/Analyze.csproj +++ b/examples/analyze/summary/Analyze.csproj @@ -2,7 +2,7 @@ Exe - net6.0 + net8.0 enable enable diff --git a/examples/analyze/topic/Analyze.csproj b/examples/analyze/topic/Analyze.csproj index d0ea3e2e..2d982838 100644 --- a/examples/analyze/topic/Analyze.csproj +++ b/examples/analyze/topic/Analyze.csproj @@ -2,7 +2,7 @@ Exe - net6.0 + net8.0 enable enable diff --git a/examples/manage/balances/Manage.csproj b/examples/manage/balances/Manage.csproj index 33d8f4ee..e8fd5f0f 100644 --- a/examples/manage/balances/Manage.csproj +++ b/examples/manage/balances/Manage.csproj @@ -2,7 +2,7 @@ Exe - net6.0 + net8.0 enable enable diff --git a/examples/manage/invitations/Manage.csproj b/examples/manage/invitations/Manage.csproj index 33d8f4ee..e8fd5f0f 100644 --- a/examples/manage/invitations/Manage.csproj +++ b/examples/manage/invitations/Manage.csproj @@ -2,7 +2,7 @@ Exe - net6.0 + net8.0 enable enable diff --git a/examples/manage/keys/Manage.csproj b/examples/manage/keys/Manage.csproj index 33d8f4ee..e8fd5f0f 100644 --- a/examples/manage/keys/Manage.csproj +++ b/examples/manage/keys/Manage.csproj @@ -2,7 +2,7 @@ Exe - net6.0 + net8.0 enable enable diff --git a/examples/manage/members/Manage.csproj b/examples/manage/members/Manage.csproj index 33d8f4ee..e8fd5f0f 100644 --- a/examples/manage/members/Manage.csproj +++ b/examples/manage/members/Manage.csproj @@ -2,7 +2,7 @@ Exe - net6.0 + net8.0 enable enable diff --git a/examples/manage/models/Models.csproj b/examples/manage/models/Models.csproj index 33d8f4ee..e8fd5f0f 100644 --- a/examples/manage/models/Models.csproj +++ b/examples/manage/models/Models.csproj @@ -2,7 +2,7 @@ Exe - net6.0 + net8.0 enable enable diff --git a/examples/manage/projects/Manage.csproj b/examples/manage/projects/Manage.csproj index 33d8f4ee..e8fd5f0f 100644 --- a/examples/manage/projects/Manage.csproj +++ b/examples/manage/projects/Manage.csproj @@ -2,7 +2,7 @@ Exe - net6.0 + net8.0 enable enable diff --git a/examples/manage/scopes/Manage.csproj b/examples/manage/scopes/Manage.csproj index 33d8f4ee..e8fd5f0f 100644 --- a/examples/manage/scopes/Manage.csproj +++ b/examples/manage/scopes/Manage.csproj @@ -2,7 +2,7 @@ Exe - net6.0 + net8.0 enable enable diff --git a/examples/manage/usage/Manage.csproj b/examples/manage/usage/Manage.csproj index 33d8f4ee..e8fd5f0f 100644 --- a/examples/manage/usage/Manage.csproj +++ b/examples/manage/usage/Manage.csproj @@ -2,7 +2,7 @@ Exe - net6.0 + net8.0 enable enable diff --git a/examples/speech-to-text/rest/file/PreRecorded.csproj b/examples/speech-to-text/rest/file/PreRecorded.csproj index 926b858a..621c2815 100644 --- a/examples/speech-to-text/rest/file/PreRecorded.csproj +++ b/examples/speech-to-text/rest/file/PreRecorded.csproj @@ -2,7 +2,7 @@ Exe - net6.0 + net8.0 enable enable diff --git a/examples/speech-to-text/rest/intent/PreRecorded.csproj b/examples/speech-to-text/rest/intent/PreRecorded.csproj index 8eeb0cf7..d1be0fde 100644 --- a/examples/speech-to-text/rest/intent/PreRecorded.csproj +++ b/examples/speech-to-text/rest/intent/PreRecorded.csproj @@ -2,7 +2,7 @@ Exe - net6.0 + net8.0 enable enable diff --git a/examples/speech-to-text/rest/sentiment/PreRecorded.csproj b/examples/speech-to-text/rest/sentiment/PreRecorded.csproj index 8eeb0cf7..d1be0fde 100644 --- a/examples/speech-to-text/rest/sentiment/PreRecorded.csproj +++ b/examples/speech-to-text/rest/sentiment/PreRecorded.csproj @@ -2,7 +2,7 @@ Exe - net6.0 + net8.0 enable enable diff --git a/examples/speech-to-text/rest/summary/PreRecorded.csproj b/examples/speech-to-text/rest/summary/PreRecorded.csproj index 8eeb0cf7..d1be0fde 100644 --- a/examples/speech-to-text/rest/summary/PreRecorded.csproj +++ b/examples/speech-to-text/rest/summary/PreRecorded.csproj @@ -2,7 +2,7 @@ Exe - net6.0 + net8.0 enable enable diff --git a/examples/speech-to-text/rest/topic/PreRecorded.csproj b/examples/speech-to-text/rest/topic/PreRecorded.csproj index 8eeb0cf7..d1be0fde 100644 --- a/examples/speech-to-text/rest/topic/PreRecorded.csproj +++ b/examples/speech-to-text/rest/topic/PreRecorded.csproj @@ -2,7 +2,7 @@ Exe - net6.0 + net8.0 enable enable diff --git a/examples/speech-to-text/rest/url/PreRecorded.csproj b/examples/speech-to-text/rest/url/PreRecorded.csproj index b026a7f9..8747a53c 100644 --- a/examples/speech-to-text/rest/url/PreRecorded.csproj +++ b/examples/speech-to-text/rest/url/PreRecorded.csproj @@ -2,7 +2,7 @@ Exe - net6.0 + net8.0 enable enable diff --git a/examples/speech-to-text/websocket/file/Streaming.csproj b/examples/speech-to-text/websocket/file/Streaming.csproj index 664d0a8e..10720935 100644 --- a/examples/speech-to-text/websocket/file/Streaming.csproj +++ b/examples/speech-to-text/websocket/file/Streaming.csproj @@ -2,7 +2,7 @@ Exe - net6.0 + net8.0 enable enable diff --git a/examples/speech-to-text/websocket/http/Streaming.csproj b/examples/speech-to-text/websocket/http/Streaming.csproj index 664d0a8e..10720935 100644 --- a/examples/speech-to-text/websocket/http/Streaming.csproj +++ b/examples/speech-to-text/websocket/http/Streaming.csproj @@ -2,7 +2,7 @@ Exe - net6.0 + net8.0 enable enable diff --git a/examples/speech-to-text/websocket/microphone/Streaming.csproj b/examples/speech-to-text/websocket/microphone/Streaming.csproj index f7e99529..ecd2a096 100644 --- a/examples/speech-to-text/websocket/microphone/Streaming.csproj +++ b/examples/speech-to-text/websocket/microphone/Streaming.csproj @@ -2,7 +2,7 @@ Exe - net6.0 + net8.0 enable enable diff --git a/examples/text-to-speech/rest/file/hello-world/Speak.csproj b/examples/text-to-speech/rest/file/hello-world/Speak.csproj index 2fa6dd32..3bf3a981 100644 --- a/examples/text-to-speech/rest/file/hello-world/Speak.csproj +++ b/examples/text-to-speech/rest/file/hello-world/Speak.csproj @@ -2,7 +2,7 @@ Exe - net6.0 + net8.0 enable enable diff --git a/examples/text-to-speech/rest/file/woodchuck/Speak.csproj b/examples/text-to-speech/rest/file/woodchuck/Speak.csproj index f1973b1f..568c2537 100644 --- a/examples/text-to-speech/rest/file/woodchuck/Speak.csproj +++ b/examples/text-to-speech/rest/file/woodchuck/Speak.csproj @@ -2,7 +2,7 @@ Exe - net6.0 + net8.0 enable enable diff --git a/examples/text-to-speech/websocket/simple/Speak.csproj b/examples/text-to-speech/websocket/simple/Speak.csproj index 331a5048..c5b81816 100644 --- a/examples/text-to-speech/websocket/simple/Speak.csproj +++ b/examples/text-to-speech/websocket/simple/Speak.csproj @@ -2,7 +2,7 @@ Exe - net6.0 + net8.0 enable enable diff --git a/tests/edge_cases/keepalive/KeepAlive.csproj b/tests/edge_cases/keepalive/KeepAlive.csproj index c1f1063c..ea984555 100644 --- a/tests/edge_cases/keepalive/KeepAlive.csproj +++ b/tests/edge_cases/keepalive/KeepAlive.csproj @@ -2,7 +2,7 @@ Exe - net6.0 + net8.0 enable enable diff --git a/tests/edge_cases/reconnect_same_object/ReconnectStreaming.csproj b/tests/edge_cases/reconnect_same_object/ReconnectStreaming.csproj index 91d69f95..4d3315dc 100644 --- a/tests/edge_cases/reconnect_same_object/ReconnectStreaming.csproj +++ b/tests/edge_cases/reconnect_same_object/ReconnectStreaming.csproj @@ -2,7 +2,7 @@ Exe - net6.0 + net8.0 enable enable diff --git a/tests/edge_cases/string_parsing/StringParsing.csproj b/tests/edge_cases/string_parsing/StringParsing.csproj index 16840738..b44b05bc 100644 --- a/tests/edge_cases/string_parsing/StringParsing.csproj +++ b/tests/edge_cases/string_parsing/StringParsing.csproj @@ -2,7 +2,7 @@ Exe - net6.0 + net8.0 enable enable diff --git a/tests/edge_cases/stt_v1_client_example/Streaming.csproj b/tests/edge_cases/stt_v1_client_example/Streaming.csproj index f02f97b4..5f1dab4f 100644 --- a/tests/edge_cases/stt_v1_client_example/Streaming.csproj +++ b/tests/edge_cases/stt_v1_client_example/Streaming.csproj @@ -2,7 +2,7 @@ Exe - net6.0 + net8.0 enable enable diff --git a/tests/edge_cases/tts_v1_client_example/Speak.csproj b/tests/edge_cases/tts_v1_client_example/Speak.csproj index 33d8f4ee..e8fd5f0f 100644 --- a/tests/edge_cases/tts_v1_client_example/Speak.csproj +++ b/tests/edge_cases/tts_v1_client_example/Speak.csproj @@ -2,7 +2,7 @@ Exe - net6.0 + net8.0 enable enable diff --git a/tests/expected_failures/rest/bad_host/BadHost.csproj b/tests/expected_failures/rest/bad_host/BadHost.csproj index 39bfa63e..7b623920 100644 --- a/tests/expected_failures/rest/bad_host/BadHost.csproj +++ b/tests/expected_failures/rest/bad_host/BadHost.csproj @@ -2,7 +2,7 @@ Exe - net6.0 + net8.0 enable enable diff --git a/tests/expected_failures/rest/throw_exception/ThrowException.csproj b/tests/expected_failures/rest/throw_exception/ThrowException.csproj index b026a7f9..8747a53c 100644 --- a/tests/expected_failures/rest/throw_exception/ThrowException.csproj +++ b/tests/expected_failures/rest/throw_exception/ThrowException.csproj @@ -2,7 +2,7 @@ Exe - net6.0 + net8.0 enable enable diff --git a/tests/expected_failures/rest/trigger_cancel/TriggerCancel.csproj b/tests/expected_failures/rest/trigger_cancel/TriggerCancel.csproj index 39bfa63e..7b623920 100644 --- a/tests/expected_failures/rest/trigger_cancel/TriggerCancel.csproj +++ b/tests/expected_failures/rest/trigger_cancel/TriggerCancel.csproj @@ -2,7 +2,7 @@ Exe - net6.0 + net8.0 enable enable diff --git a/tests/expected_failures/websocket/exercise_timeout/ExerciseTimeout.csproj b/tests/expected_failures/websocket/exercise_timeout/ExerciseTimeout.csproj index 39bfa63e..7b623920 100644 --- a/tests/expected_failures/websocket/exercise_timeout/ExerciseTimeout.csproj +++ b/tests/expected_failures/websocket/exercise_timeout/ExerciseTimeout.csproj @@ -2,7 +2,7 @@ Exe - net6.0 + net8.0 enable enable