From fe0116d45ec60c9ce3b946017cb5cfc6d5a4ff83 Mon Sep 17 00:00:00 2001 From: "victor.govorov" Date: Thu, 18 Sep 2025 23:37:40 +0500 Subject: [PATCH 1/3] =?UTF-8?q?=D0=BE=D0=B1=D0=BD=D0=BE=D0=B2=D0=B8=D0=BB?= =?UTF-8?q?=20=D0=BF=D0=B0=D0=BA=D0=B5=D1=82=D1=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/Byndyusoft.Net.Http.MessagePack.csproj | 2 +- tests/Byndyusoft.Net.Http.MessagePack.Tests.csproj | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/Byndyusoft.Net.Http.MessagePack.csproj b/src/Byndyusoft.Net.Http.MessagePack.csproj index 5290091..fabd103 100644 --- a/src/Byndyusoft.Net.Http.MessagePack.csproj +++ b/src/Byndyusoft.Net.Http.MessagePack.csproj @@ -2,7 +2,7 @@ true - netstandard2.0;net6.0 + netstandard2.0;net8 icon.png MIT System.Net.Http.MessagePack diff --git a/tests/Byndyusoft.Net.Http.MessagePack.Tests.csproj b/tests/Byndyusoft.Net.Http.MessagePack.Tests.csproj index 0dc480a..0fa4a61 100644 --- a/tests/Byndyusoft.Net.Http.MessagePack.Tests.csproj +++ b/tests/Byndyusoft.Net.Http.MessagePack.Tests.csproj @@ -1,7 +1,7 @@ - net6.0 + net8 System.Net.Http.Tests false InProcess @@ -11,13 +11,13 @@ - - - + + + runtime; build; native; contentfiles; analyzers; buildtransitive all - + runtime; build; native; contentfiles; analyzers; buildtransitive all From c417f97949bcc2644789bd2a7cfe51293ed85193 Mon Sep 17 00:00:00 2001 From: "victor.govorov" Date: Thu, 18 Sep 2025 23:54:25 +0500 Subject: [PATCH 2/3] net8.0 --- .github/workflows/pull-request.yml | 2 +- .github/workflows/push.yml | 2 +- .github/workflows/release.yml | 2 +- src/Byndyusoft.Net.Http.MessagePack.csproj | 4 ++-- src/HttpContentMessagePackExtensions.cs | 4 ++++ tests/Byndyusoft.Net.Http.MessagePack.Tests.csproj | 4 ++-- 6 files changed, 11 insertions(+), 7 deletions(-) diff --git a/.github/workflows/pull-request.yml b/.github/workflows/pull-request.yml index 4c49f00..32c4868 100644 --- a/.github/workflows/pull-request.yml +++ b/.github/workflows/pull-request.yml @@ -21,7 +21,7 @@ jobs: - name: install dotnet uses: actions/setup-dotnet@v4 with: - dotnet-version: 6.0.x + dotnet-version: 8.0.x - name: install packages run: dotnet restore diff --git a/.github/workflows/push.yml b/.github/workflows/push.yml index d4b891c..8ef7630 100644 --- a/.github/workflows/push.yml +++ b/.github/workflows/push.yml @@ -21,7 +21,7 @@ jobs: - name: install dotnet uses: actions/setup-dotnet@v4 with: - dotnet-version: 6.0.x + dotnet-version: 8.0.x - name: install packages run: dotnet restore diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index cb6d889..471e70f 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -16,7 +16,7 @@ jobs: - name: install dotnet uses: actions/setup-dotnet@v4 with: - dotnet-version: 6.0.x + dotnet-version: 8.0.x - name: build run: dotnet build diff --git a/src/Byndyusoft.Net.Http.MessagePack.csproj b/src/Byndyusoft.Net.Http.MessagePack.csproj index fabd103..7ca0fb6 100644 --- a/src/Byndyusoft.Net.Http.MessagePack.csproj +++ b/src/Byndyusoft.Net.Http.MessagePack.csproj @@ -1,8 +1,8 @@ - + true - netstandard2.0;net8 + netstandard2.0;net8.0 icon.png MIT System.Net.Http.MessagePack diff --git a/src/HttpContentMessagePackExtensions.cs b/src/HttpContentMessagePackExtensions.cs index 049eb50..a886360 100644 --- a/src/HttpContentMessagePackExtensions.cs +++ b/src/HttpContentMessagePackExtensions.cs @@ -30,7 +30,11 @@ public static class HttpContentMessagePackExtensions if (content is ObjectContent objectContent) return objectContent.Value; var formatter = new MessagePackMediaTypeFormatter(options); +#if NET5_0_OR_GREATER + await using var readStream = await content.ReadAsStreamAsync(cancellationToken).ConfigureAwait(false); +#else using var readStream = await content.ReadAsStreamAsync().ConfigureAwait(false); +#endif return await formatter.ReadFromStreamAsync(type, readStream, content, null, cancellationToken) .ConfigureAwait(false); } diff --git a/tests/Byndyusoft.Net.Http.MessagePack.Tests.csproj b/tests/Byndyusoft.Net.Http.MessagePack.Tests.csproj index 0fa4a61..51da552 100644 --- a/tests/Byndyusoft.Net.Http.MessagePack.Tests.csproj +++ b/tests/Byndyusoft.Net.Http.MessagePack.Tests.csproj @@ -1,7 +1,7 @@ - + - net8 + net8.0 System.Net.Http.Tests false InProcess From 1b9876ff451043b052d8d6b7ab31c834cdc41fd9 Mon Sep 17 00:00:00 2001 From: "victor.govorov" Date: Fri, 19 Sep 2025 00:01:19 +0500 Subject: [PATCH 3/3] up version --- src/Byndyusoft.Net.Http.MessagePack.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Byndyusoft.Net.Http.MessagePack.csproj b/src/Byndyusoft.Net.Http.MessagePack.csproj index 7ca0fb6..a2c4695 100644 --- a/src/Byndyusoft.Net.Http.MessagePack.csproj +++ b/src/Byndyusoft.Net.Http.MessagePack.csproj @@ -18,7 +18,7 @@ System.Net.Http.MessagePack.Formatting.MessagePackMediaTypeFormatter Byndyusoft;Net;Http;MessagePack - 0.5.4 + 0.6.0 Byndyusoft https://github.com/Byndyusoft/Byndyusoft.Net.Http.MessagePack git