From 9e40412a3ae753e8732ea0dfd094d76da6a6da87 Mon Sep 17 00:00:00 2001
From: MiguelGuedelha <miguel.guedelha.business@gmail.com>
Date: Tue, 8 Oct 2024 20:05:42 +0100
Subject: [PATCH] Upgraded Microsoft.IO.RecyclableMemoryStream -> 3.0.1. Addded
 NET 8.0 targets. Fixed sample project

---
 NodeReact.Benchmarks/NodeReact.Benchmarks.csproj      |  2 +-
 .../NodeReact.Sample.Streaming.csproj                 |  2 +-
 NodeReact.Sample/ClientApp/components/index.js        |  8 ++++----
 NodeReact.Sample/NodeReact.Sample.csproj              |  2 +-
 NodeReact/NodeReact.csproj                            |  4 ++--
 NodeReact/Utils/PooledStream.cs                       | 11 +++++++----
 6 files changed, 16 insertions(+), 13 deletions(-)

diff --git a/NodeReact.Benchmarks/NodeReact.Benchmarks.csproj b/NodeReact.Benchmarks/NodeReact.Benchmarks.csproj
index 5f63d5f..44ead11 100644
--- a/NodeReact.Benchmarks/NodeReact.Benchmarks.csproj
+++ b/NodeReact.Benchmarks/NodeReact.Benchmarks.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net7.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <LangVersion>7.1</LangVersion>
   </PropertyGroup>
   <ItemGroup>
diff --git a/NodeReact.Sample.Streaming/NodeReact.Sample.Streaming.csproj b/NodeReact.Sample.Streaming/NodeReact.Sample.Streaming.csproj
index 160bd92..4deeb1c 100644
--- a/NodeReact.Sample.Streaming/NodeReact.Sample.Streaming.csproj
+++ b/NodeReact.Sample.Streaming/NodeReact.Sample.Streaming.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
   <PropertyGroup>
-    <TargetFramework>net7.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <AssemblyName>NodeReact.Sample.Streaming</AssemblyName>
     <RootNamespace>NodeReact.Sample.Streaming</RootNamespace>
   </PropertyGroup>
diff --git a/NodeReact.Sample/ClientApp/components/index.js b/NodeReact.Sample/ClientApp/components/index.js
index 0226892..b5e5cc4 100644
--- a/NodeReact.Sample/ClientApp/components/index.js
+++ b/NodeReact.Sample/ClientApp/components/index.js
@@ -1,11 +1,11 @@
-import HelloWorld from "./HelloWorld";
-import RootComponent from "./RootComponent";
-import App from "./App";
+import HelloWorld from './HelloWorld';
+import LoremIpsum from './LoremIpsum';
+import RootComponent from './RootComponent';
 
 export const components = {
   HelloWorld,
   RootComponent,
-  App,
+  LoremIpsum
 };
 
 try {
diff --git a/NodeReact.Sample/NodeReact.Sample.csproj b/NodeReact.Sample/NodeReact.Sample.csproj
index 2e5a454..5a9066d 100644
--- a/NodeReact.Sample/NodeReact.Sample.csproj
+++ b/NodeReact.Sample/NodeReact.Sample.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
   <PropertyGroup>
-    <TargetFramework>net7.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
   </PropertyGroup>
   <ItemGroup>
     <ProjectReference Include="..\NodeReact\NodeReact.csproj" />
diff --git a/NodeReact/NodeReact.csproj b/NodeReact/NodeReact.csproj
index 5432f1e..3a10dc4 100644
--- a/NodeReact/NodeReact.csproj
+++ b/NodeReact/NodeReact.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
     <PropertyGroup>
-        <TargetFrameworks>net6.0;net7.0</TargetFrameworks>
+        <TargetFrameworks>net6.0;net7.0;net8.0</TargetFrameworks>
 
         <Description>Library to render React library components on the server-side with C# as well as on the client.</Description>
         <PackageTags>react, reactjs, nodejs</PackageTags>
@@ -22,7 +22,7 @@
 
         <PackageReference Include="Jering.Javascript.NodeJS" Version="7.0.0-beta.3" />
 
-        <PackageReference Include="Microsoft.IO.RecyclableMemoryStream" Version="2.3.1" />
+        <PackageReference Include="Microsoft.IO.RecyclableMemoryStream" Version="3.0.1" />
         <PackageReference Include="Newtonsoft.Json" Version="13.0.2" />
 
         <PackageReference Include="Yarn.MSBuild" Version="1.22.19" PrivateAssets="all" ExcludeAssets="Runtime">
diff --git a/NodeReact/Utils/PooledStream.cs b/NodeReact/Utils/PooledStream.cs
index c77f76e..783f9bc 100644
--- a/NodeReact/Utils/PooledStream.cs
+++ b/NodeReact/Utils/PooledStream.cs
@@ -15,13 +15,16 @@ static PooledStream()
         var largeBufferMultiple = 1024 * 1024;
         var maximumBufferSize = 128 * 1024 * 1024;
         
-        _manager = new RecyclableMemoryStreamManager(blockSize, largeBufferMultiple, maximumBufferSize)
+        _manager = new RecyclableMemoryStreamManager(new RecyclableMemoryStreamManager.Options()
         {
+            BlockSize = blockSize,
+            LargeBufferMultiple = largeBufferMultiple,
+            MaximumBufferSize = maximumBufferSize,
             GenerateCallStacks = true,
             AggressiveBufferReturn = true,
-            MaximumFreeLargePoolBytes = largeBufferMultiple * 4,
-            MaximumFreeSmallPoolBytes = 250 * blockSize
-        };
+            MaximumLargePoolFreeBytes = largeBufferMultiple * 4,
+            MaximumSmallPoolFreeBytes = 250 * blockSize
+        });
     }
 
     public PooledStream()