Updated packages

fsprojects · Dec 12, 2023 · 783772b · 783772b
1 parent 6bafafc
commit 783772b
Show file tree

Hide file tree

Showing 11 changed files with 21 additions and 27 deletions.
diff --git a/examples/CsharpExamples/CsharpExamples.csproj b/examples/CsharpExamples/CsharpExamples.csproj
@@ -6,8 +6,8 @@
   </PropertyGroup>
   <ItemGroup>
     <PackageReference Include="Microsoft.Extensions.Logging.Console" Version="8.0.0" />
-    <PackageReference Include="OpenTelemetry.Exporter.Console" Version="1.6.0" />
-    <PackageReference Include="OpenTelemetry" Version="1.6.0" />
+    <PackageReference Include="OpenTelemetry.Exporter.Console" Version="1.7.0" />
+    <PackageReference Include="OpenTelemetry" Version="1.7.0" />
     <PackageReference Include="Pulsar.Client" Version="3.1.0" />
     <PackageReference Include="Pulsar.Client.Otel" Version="0.1.2" />
   </ItemGroup>

diff --git a/examples/FsharpExamples/FsharpExamples.fsproj b/examples/FsharpExamples/FsharpExamples.fsproj
@@ -17,8 +17,8 @@
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="Microsoft.Extensions.Logging.Console" Version="8.0.0" />
-    <PackageReference Include="OpenTelemetry.Exporter.Console" Version="1.6.0" />
-    <PackageReference Include="OpenTelemetry" Version="1.6.0" />
+    <PackageReference Include="OpenTelemetry.Exporter.Console" Version="1.7.0" />
+    <PackageReference Include="OpenTelemetry" Version="1.7.0" />
     <PackageReference Include="Pulsar.Client" Version="3.1.0" />
     <PackageReference Include="Pulsar.Client.Otel" Version="0.1.2" />
   </ItemGroup>

diff --git a/src/Pulsar.Client.Otel/Pulsar.Client.Otel.fsproj b/src/Pulsar.Client.Otel/Pulsar.Client.Otel.fsproj
@@ -31,8 +31,8 @@
     <Compile Include="OtelConsumerInterceptor.fs" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="Pulsar.Client" Version="2.14.0" />
-    <PackageReference Include="OpenTelemetry.Api" Version="1.6.0" />
+    <PackageReference Include="Pulsar.Client" Version="3.1.0" />
+    <PackageReference Include="OpenTelemetry.Api" Version="1.7.0" />
     <PackageReference Include="AvroSchemaGenerator" Version="2.9.2" />
     <!--Microsoft-->
     <PackageReference Include="System.Diagnostics.DiagnosticSource" Version="8.0.0" />

diff --git a/src/Pulsar.Client.Proto/Pulsar.Client.Proto.csproj b/src/Pulsar.Client.Proto/Pulsar.Client.Proto.csproj
@@ -5,7 +5,7 @@
     <Nullable>disable</Nullable>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="protobuf-net" Version="3.2.26" />
-    <PackageReference Include="Microsoft.IO.RecyclableMemoryStream" Version="2.3.2" />
+    <PackageReference Include="protobuf-net" Version="3.2.30" />
+    <PackageReference Include="Microsoft.IO.RecyclableMemoryStream" Version="3.0.0" />
   </ItemGroup>
 </Project>
diff --git a/src/Pulsar.Client/Common/Commands.fs b/src/Pulsar.Client/Common/Commands.fs
@@ -4,7 +4,6 @@ open System.Collections
 open System.Collections.Generic
 open System.IO.Pipelines
 open System.Threading.Tasks
-open Microsoft.IO
 open Pulsar.Client.Transaction
 open pulsar.proto
 open FSharp.UMX
@@ -54,7 +53,7 @@ let private serializeSimpleCommand (command : BaseCommand) =
 
 let private serializePayloadCommand (command : BaseCommand) (metadata: MessageMetadata) (payload: MemoryStream) =
     struct((fun (output: PipeWriter) ->
-        let temp = MemoryStreamManager.GetStream("payload") :?> RecyclableMemoryStream
+        let temp = MemoryStreamManager.GetStream("payload")
         let binaryWriter = new BinaryWriter(temp)
 
         // write fake totalLength

diff --git a/src/Pulsar.Client/Common/Tools.fs b/src/Pulsar.Client/Common/Tools.fs
@@ -3,11 +3,8 @@ module internal Pulsar.Client.Common.Tools
 
 open System
 open System.Collections
-open System.IO
 open System.Net
-open System.Runtime.InteropServices
 open System.Threading.Tasks
-open Microsoft.FSharp.NativeInterop
 open Microsoft.IO
 open System.Runtime.ExceptionServices
 open System.Collections.Generic
@@ -139,7 +136,7 @@ let fromLongArray (ackSets: int64[]) (numMessagesInBatch: int) =
         let stillToGo = numMessagesInBatch - index
         let currentLimit = if stillToGo > 64 then 64 else stillToGo
         for bitNumber in 1..currentLimit do
-            bitArray.[index] <- (ackSet &&& (1L <<< bitNumber-1)) <> 0L // https://stackoverflow.com/a/4854257/1780648
+            bitArray[index] <- (ackSet &&& (1L <<< bitNumber-1)) <> 0L // https://stackoverflow.com/a/4854257/1780648
             index <- index + 1
     bitArray
 

diff --git a/src/Pulsar.Client/Internal/ProducerImpl.fs b/src/Pulsar.Client/Internal/ProducerImpl.fs
@@ -6,7 +6,6 @@ open System.Threading
 
 open System.Threading.Tasks
 open FSharp.UMX
-open Microsoft.IO
 open pulsar.proto
 open Pulsar.Client.Common
 open Pulsar.Client.Internal
@@ -221,7 +220,7 @@ type internal ProducerImpl<'T> private (producerConfig: ProducerConfiguration, c
 
     let verifyIfLocalBufferIsCorrupted (msg: PendingMessage<'T>) =
         backgroundTask {
-            use stream = MemoryStreamManager.GetStream() :?> RecyclableMemoryStream
+            use stream = MemoryStreamManager.GetStream()
             use reader = new BinaryReader(stream)
             let struct(send, _) = msg.Payload
             let writer = PipeWriter.Create(stream, StreamPipeWriterOptions(leaveOpen = true))
@@ -445,7 +444,7 @@ type internal ProducerImpl<'T> private (producerConfig: ProducerConfiguration, c
                                 metadata.ChunkId <- chunkId
                                 metadata.NumChunksFromMsg <- totalChunks
                                 metadata.TotalChunkMsgSize <- payloadLength
-                                let chunkStream = MemoryStreamManager.GetStream("chunk") :?> RecyclableMemoryStream
+                                let chunkStream = MemoryStreamManager.GetStream("chunk")
                                 compressedPayload.Seek(readStartIndex, SeekOrigin.Begin) |> ignore
                                 let chunkSize = Math.Min(maxMessageSize, payloadLength - readStartIndex)
                                 let targetSpan = chunkStream.GetSpan(chunkSize).Slice(0, chunkSize)

diff --git a/src/Pulsar.Client/Pulsar.Client.fsproj b/src/Pulsar.Client/Pulsar.Client.fsproj
@@ -41,15 +41,15 @@
     <ProjectReference Include="..\Pulsar.Client.Proto\Pulsar.Client.Proto.csproj" PrivateAssets="all" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1" PrivateAssets="All" />
+    <PackageReference Include="Microsoft.SourceLink.GitHub" Version="8.0.0" PrivateAssets="All" />
     <PackageReference Include="FSharp.UMX" Version="1.1.0" />
-    <PackageReference Include="protobuf-net" Version="3.2.26" />
+    <PackageReference Include="protobuf-net" Version="3.2.30" />
     <PackageReference Include="zlib.net-mutliplatform" Version="1.0.6" />
     <PackageReference Include="K4os.Compression.LZ4" Version="1.3.6" />
     <PackageReference Include="Snappy.Standard" Version="0.2.0" />
     <PackageReference Include="ZstdNet" Version="1.4.5" />
     <PackageReference Include="Pipelines.Sockets.Unofficial" Version="2.2.8" />
-    <PackageReference Include="Microsoft.IO.RecyclableMemoryStream" Version="2.3.2" />
+    <PackageReference Include="Microsoft.IO.RecyclableMemoryStream" Version="3.0.0" />
     <PackageReference Include="AvroSchemaGenerator" Version="2.9.2" />
     <PackageReference Include="Apache.Avro" Version="1.11.3" />
     <PackageReference Include="NSec.Cryptography" Version="22.4.0" />

diff --git a/tests/IntegrationTests/IntegrationTests.fsproj b/tests/IntegrationTests/IntegrationTests.fsproj
@@ -45,11 +45,11 @@
   <ItemGroup>
     <PackageReference Include="Expecto" Version="10.1.0" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.8.0" />
-    <PackageReference Include="YoloDev.Expecto.TestSdk" Version="0.14.2" />
+    <PackageReference Include="YoloDev.Expecto.TestSdk" Version="0.14.3" />
     <PackageReference Include="Serilog" Version="3.1.1" />
     <PackageReference Include="Serilog.Extensions.Logging" Version="8.0.0" />
     <PackageReference Include="Serilog.Enrichers.Thread" Version="3.1.0" />
-    <PackageReference Include="Serilog.Sinks.Console" Version="5.0.0" />
+    <PackageReference Include="Serilog.Sinks.Console" Version="5.0.1" />
     <!--Microsoft-->
     <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="8.0.0" />
   </ItemGroup>

diff --git a/tests/UnitTests/Common/HashTests.fs b/tests/UnitTests/Common/HashTests.fs
@@ -3,7 +3,6 @@
 open System.IO
 open Expecto
 open Expecto.Flip
-open Microsoft.IO
 open Pulsar.Client.Common
 
 [<Tests>]
@@ -41,7 +40,7 @@ let crc32cTests =
 
         test "CRC32Hash RMS" {
             let input = "Съешь ещё этих мягких французских булок, да выпей чаю" |> System.Text.Encoding.UTF8.GetBytes
-            let recycl = MemoryStreamManager.GetStream() :?> RecyclableMemoryStream
+            let recycl = MemoryStreamManager.GetStream()
             recycl.Write(input)
             recycl.Seek(0L, SeekOrigin.Begin) |> ignore
             let hash = CRC32C.GetForROS(recycl.GetReadOnlySequence().Slice(0,input.Length))
@@ -50,7 +49,7 @@ let crc32cTests =
 
         test "CRC32Hash long RMS" {
             let input: byte[] = Array.create 750000 1uy
-            let recycl = MemoryStreamManager.GetStream() :?> RecyclableMemoryStream
+            let recycl = MemoryStreamManager.GetStream()
             recycl.Write(input)
             recycl.Seek(0L, SeekOrigin.Begin) |> ignore
             let hash = CRC32C.GetForROS(recycl.GetReadOnlySequence().Slice(0,input.Length))

diff --git a/tests/UnitTests/UnitTests.fsproj b/tests/UnitTests/UnitTests.fsproj
@@ -47,10 +47,10 @@
     <PackageReference Include="Expecto" Version="10.1.0" />
     <PackageReference Include="Expecto.FsCheck" Version="10.1.0" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.8.0" />
-    <PackageReference Include="YoloDev.Expecto.TestSdk" Version="0.14.2" />
+    <PackageReference Include="YoloDev.Expecto.TestSdk" Version="0.14.3" />
     <PackageReference Include="Serilog" Version="3.1.1" />
     <PackageReference Include="Serilog.Extensions.Logging" Version="8.0.0" />
     <PackageReference Include="Serilog.Enrichers.Thread" Version="3.1.0" />
-    <PackageReference Include="Serilog.Sinks.Console" Version="5.0.0" />
+    <PackageReference Include="Serilog.Sinks.Console" Version="5.0.1" />
   </ItemGroup>
 </Project>