diff --git a/README.md b/README.md index a38602cc..0c0eec89 100644 --- a/README.md +++ b/README.md @@ -28,7 +28,7 @@ for currently available features. - Arrow specification 1.0.0. (Support for reading 0.11+.) - C# 11 -- .NET Standard 2.0 and .NET 6.0 +- .NET Standard 2.0 and .NET 8.0+ - Asynchronous I/O - Uses modern .NET runtime features such as **Span<T>**, **Memory<T>**, **MemoryManager<T>**, and **System.Buffers** primitives for memory allocation, memory storage, and fast serialization. - Uses **Acyclic Visitor Pattern** for array types and arrays to facilitate serialization, record batch traversal, and format growth. diff --git a/docs/index.md b/docs/index.md index 732e339f..0a61a9e2 100644 --- a/docs/index.md +++ b/docs/index.md @@ -31,7 +31,7 @@ for currently available features. - Arrow specification 1.0.0. (Support for reading 0.11+.) - C# 11 -- .NET Standard 2.0, .NET 6.0, .NET 8.0 and .NET Framework 4.6.2 +- .NET Standard 2.0, .NET 8.0+ and .NET Framework 4.6.2 - Asynchronous I/O - Uses modern .NET runtime features such as **Span<T>**, **Memory<T>**, **MemoryManager<T>**, and **System.Buffers** primitives for memory allocation, memory storage, and fast serialization. - Uses **Acyclic Visitor Pattern** for array types and arrays to facilitate serialization, record batch traversal, and format growth. diff --git a/examples/FlightAspServerExample/FlightAspServerExample.csproj b/examples/FlightAspServerExample/FlightAspServerExample.csproj index e6d8e3dc..2af606a6 100644 --- a/examples/FlightAspServerExample/FlightAspServerExample.csproj +++ b/examples/FlightAspServerExample/FlightAspServerExample.csproj @@ -20,7 +20,7 @@ - net8.0 + net8.0;net10.0 enable enable 10 diff --git a/examples/FlightClientExample/FlightClientExample.csproj b/examples/FlightClientExample/FlightClientExample.csproj index ce0ec833..f64142f2 100644 --- a/examples/FlightClientExample/FlightClientExample.csproj +++ b/examples/FlightClientExample/FlightClientExample.csproj @@ -21,7 +21,7 @@ Exe - net8.0 + net8.0;net10.0 diff --git a/examples/FluentBuilderExample/FluentBuilderExample.csproj b/examples/FluentBuilderExample/FluentBuilderExample.csproj index b1d76d4d..cb6aeafa 100644 --- a/examples/FluentBuilderExample/FluentBuilderExample.csproj +++ b/examples/FluentBuilderExample/FluentBuilderExample.csproj @@ -2,7 +2,7 @@ Exe - net8.0 + net8.0;net10.0 diff --git a/src/Apache.Arrow.Flight.AspNetCore/Apache.Arrow.Flight.AspNetCore.csproj b/src/Apache.Arrow.Flight.AspNetCore/Apache.Arrow.Flight.AspNetCore.csproj index 6ea0e3ce..2734d2c7 100644 --- a/src/Apache.Arrow.Flight.AspNetCore/Apache.Arrow.Flight.AspNetCore.csproj +++ b/src/Apache.Arrow.Flight.AspNetCore/Apache.Arrow.Flight.AspNetCore.csproj @@ -1,7 +1,7 @@ - net6.0 + net8.0;net10.0 diff --git a/src/Apache.Arrow.Flight.Sql/Apache.Arrow.Flight.Sql.csproj b/src/Apache.Arrow.Flight.Sql/Apache.Arrow.Flight.Sql.csproj index e696fc8d..bd897751 100644 --- a/src/Apache.Arrow.Flight.Sql/Apache.Arrow.Flight.Sql.csproj +++ b/src/Apache.Arrow.Flight.Sql/Apache.Arrow.Flight.Sql.csproj @@ -1,6 +1,6 @@ - netstandard2.1 + netstandard2.1 enable diff --git a/src/Apache.Arrow/Apache.Arrow.csproj b/src/Apache.Arrow/Apache.Arrow.csproj index cb5a03b9..a024ad11 100644 --- a/src/Apache.Arrow/Apache.Arrow.csproj +++ b/src/Apache.Arrow/Apache.Arrow.csproj @@ -8,7 +8,7 @@ - netstandard2.0;net6.0;net8.0;net462 + netstandard2.0;net8.0;net10.0;net462 diff --git a/test/Apache.Arrow.Benchmarks/Apache.Arrow.Benchmarks.csproj b/test/Apache.Arrow.Benchmarks/Apache.Arrow.Benchmarks.csproj index 4ef0a011..cf5e9afc 100644 --- a/test/Apache.Arrow.Benchmarks/Apache.Arrow.Benchmarks.csproj +++ b/test/Apache.Arrow.Benchmarks/Apache.Arrow.Benchmarks.csproj @@ -2,7 +2,7 @@ Exe - net8.0 + net8.0;net10.0 diff --git a/test/Apache.Arrow.Compression.Tests/Apache.Arrow.Compression.Tests.csproj b/test/Apache.Arrow.Compression.Tests/Apache.Arrow.Compression.Tests.csproj index 1a307af4..b0d6861c 100644 --- a/test/Apache.Arrow.Compression.Tests/Apache.Arrow.Compression.Tests.csproj +++ b/test/Apache.Arrow.Compression.Tests/Apache.Arrow.Compression.Tests.csproj @@ -1,15 +1,32 @@ - + - net8.0 - false + + net8.0;net10.0;net472;net462 + + + net8.0;net10.0 + + - + + + + + all + runtime; build; native; contentfiles; analyzers + + + + + all + runtime; build; native; contentfiles; analyzers + diff --git a/test/Apache.Arrow.Compression.Tests/ArrowStreamReaderTests.cs b/test/Apache.Arrow.Compression.Tests/ArrowStreamReaderTests.cs index e432e37e..3ee253ac 100644 --- a/test/Apache.Arrow.Compression.Tests/ArrowStreamReaderTests.cs +++ b/test/Apache.Arrow.Compression.Tests/ArrowStreamReaderTests.cs @@ -102,5 +102,23 @@ private static void VerifyCompressedIpcFileBatch(RecordBatch batch) } } } -} +#if !NET8_0_OR_GREATER + + static class StreamExtensions + { + public static void ReadExactly(this System.IO.Stream stream, byte[] buffer) + { + int length = 0; + + do + { + int read = stream.Read(buffer, length, buffer.Length - length); + if (read == 0) { throw new System.IO.EndOfStreamException(); } + length += read; + } while (length < buffer.Length); + } + } + +#endif +} diff --git a/test/Apache.Arrow.Flight.IntegrationTest/Apache.Arrow.Flight.IntegrationTest.csproj b/test/Apache.Arrow.Flight.IntegrationTest/Apache.Arrow.Flight.IntegrationTest.csproj index 0d844a80..86dc9abd 100644 --- a/test/Apache.Arrow.Flight.IntegrationTest/Apache.Arrow.Flight.IntegrationTest.csproj +++ b/test/Apache.Arrow.Flight.IntegrationTest/Apache.Arrow.Flight.IntegrationTest.csproj @@ -3,13 +3,12 @@ Exe - net8.0 + net8.0;net10.0 Apache.Arrow.Flight.IntegrationTest - diff --git a/test/Apache.Arrow.Flight.Sql.Tests/Apache.Arrow.Flight.Sql.Tests.csproj b/test/Apache.Arrow.Flight.Sql.Tests/Apache.Arrow.Flight.Sql.Tests.csproj index 9e0202d7..748b2117 100644 --- a/test/Apache.Arrow.Flight.Sql.Tests/Apache.Arrow.Flight.Sql.Tests.csproj +++ b/test/Apache.Arrow.Flight.Sql.Tests/Apache.Arrow.Flight.Sql.Tests.csproj @@ -1,7 +1,7 @@ - net8.0 + net8.0;net10.0 false diff --git a/test/Apache.Arrow.Flight.TestWeb/Apache.Arrow.Flight.TestWeb.csproj b/test/Apache.Arrow.Flight.TestWeb/Apache.Arrow.Flight.TestWeb.csproj index 8940e870..79f8362a 100644 --- a/test/Apache.Arrow.Flight.TestWeb/Apache.Arrow.Flight.TestWeb.csproj +++ b/test/Apache.Arrow.Flight.TestWeb/Apache.Arrow.Flight.TestWeb.csproj @@ -1,7 +1,7 @@ - net8.0 + net8.0;net10.0 diff --git a/test/Apache.Arrow.Flight.Tests/Apache.Arrow.Flight.Tests.csproj b/test/Apache.Arrow.Flight.Tests/Apache.Arrow.Flight.Tests.csproj index 43f07654..5908c17e 100644 --- a/test/Apache.Arrow.Flight.Tests/Apache.Arrow.Flight.Tests.csproj +++ b/test/Apache.Arrow.Flight.Tests/Apache.Arrow.Flight.Tests.csproj @@ -1,7 +1,7 @@ - net8.0 + net8.0;net10.0 false diff --git a/test/Apache.Arrow.IntegrationTest/Apache.Arrow.IntegrationTest.csproj b/test/Apache.Arrow.IntegrationTest/Apache.Arrow.IntegrationTest.csproj index dfd16d60..24b05d8a 100644 --- a/test/Apache.Arrow.IntegrationTest/Apache.Arrow.IntegrationTest.csproj +++ b/test/Apache.Arrow.IntegrationTest/Apache.Arrow.IntegrationTest.csproj @@ -4,12 +4,11 @@ Exe true - net8.0 + net8.0;net10.0 - diff --git a/test/Apache.Arrow.Tests/Apache.Arrow.Tests.csproj b/test/Apache.Arrow.Tests/Apache.Arrow.Tests.csproj index 14ef96dd..92982648 100644 --- a/test/Apache.Arrow.Tests/Apache.Arrow.Tests.csproj +++ b/test/Apache.Arrow.Tests/Apache.Arrow.Tests.csproj @@ -9,10 +9,10 @@ - net8.0;net472;net462 + net8.0;net10.0;net472;net462 - net8.0 + net8.0;net10.0