.NET 9 upgrade

Open-NET-Libraries · Nov 18, 2024 · 3950a90 · 3950a90
1 parent 1453eb9
commit 3950a90
Show file tree

Hide file tree

Showing 7 changed files with 26 additions and 13 deletions.
diff --git a/Open.ChannelExtensions.Benchmarks/Open.ChannelExtensions.Benchmarks.csproj b/Open.ChannelExtensions.Benchmarks/Open.ChannelExtensions.Benchmarks.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net8.0</TargetFramework>
+    <TargetFramework>net9.0</TargetFramework>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
   </PropertyGroup>

diff --git a/Open.ChannelExtensions.ComparisonTests/Open.ChannelExtensions.ComparisonTests.csproj b/Open.ChannelExtensions.ComparisonTests/Open.ChannelExtensions.ComparisonTests.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net8.0</TargetFramework>
+    <TargetFramework>net9.0</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/Open.ChannelExtensions.Tests/Open.ChannelExtensions.Tests.csproj b/Open.ChannelExtensions.Tests/Open.ChannelExtensions.Tests.csproj
@@ -2,7 +2,7 @@
 
 	<PropertyGroup>
 		<OutputType>Exe</OutputType>
-		<TargetFramework>net8.0</TargetFramework>
+		<TargetFramework>net9.0</TargetFramework>
 		<LangVersion>latest</LangVersion>
 		<IsPackable>false</IsPackable>
 	</PropertyGroup>

diff --git a/Open.ChannelExtensions/Extensions.Join.cs b/Open.ChannelExtensions/Extensions.Join.cs
@@ -18,7 +18,7 @@ protected override bool TryPipeItems(bool _)
 				return false;
 
 			TList? batch;
-			lock (Buffer)
+			lock (SyncLock)
 			{
 				if (!source.TryRead(out batch))
 					return false;
@@ -48,7 +48,7 @@ protected override bool TryPipeItems(bool _)
 				return false;
 
 			Queue<T>? batch;
-			lock (Buffer)
+			lock (SyncLock)
 			{
 				if (!source.TryRead(out batch))
 					return false;
@@ -80,7 +80,7 @@ protected override bool TryPipeItems(bool _)
 			IMemoryOwner<T>? batch = null;
 			try
 			{
-				lock (Buffer)
+				lock (SyncLock)
 				{
 					if (!source.TryRead(out batch))
 						return false;

diff --git a/Open.ChannelExtensions/Open.ChannelExtensions.csproj b/Open.ChannelExtensions/Open.ChannelExtensions.csproj
@@ -22,7 +22,7 @@
 		<RepositoryType>git</RepositoryType>
 		<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
 		<GenerateDocumentationFile>true</GenerateDocumentationFile>
-		<Version>8.6.0</Version>
+		<Version>9.0.0</Version>
 		<PackageReleaseNotes>Added .Merge, .PipeAsync, and .PropagateCompletion extensions.</PackageReleaseNotes>
 		<PackageLicenseExpression>MIT</PackageLicenseExpression>
 		<PublishRepositoryUrl>true</PublishRepositoryUrl>
@@ -50,12 +50,12 @@
 	</ItemGroup>
 
 	<ItemGroup Condition="'$(TargetFramework)' == 'netstandard2.0' or '$(TargetFramework)' == 'netstandard2.1'">
-		<PackageReference Include="System.Threading.Channels" Version="8.*" />
-		<PackageReference Include="System.Collections.Immutable" Version="8.*" />
+		<PackageReference Include="System.Threading.Channels" Version="9.*" />
+		<PackageReference Include="System.Collections.Immutable" Version="9.*" />
 	</ItemGroup>
 
 	<ItemGroup Condition="'$(TargetFramework)' == 'netstandard2.0' ">
-		<PackageReference Include="Microsoft.Bcl.AsyncInterfaces" Version="8.0.0" />
+		<PackageReference Include="Microsoft.Bcl.AsyncInterfaces" Version="9.*" />
 	</ItemGroup>
 
 	<!-- Disable the nullable warnings when compiling for .NET Standard 2.0 -->

diff --git a/Open.ChannelExtensions/Readers/BatchingChannelReader.cs b/Open.ChannelExtensions/Readers/BatchingChannelReader.cs
@@ -76,9 +76,12 @@ public BatchingChannelReader<T, TBatch> WithTimeout(long millisecondsTimeout)
 		if (_batch is null) return this;
 
 		// Might be in the middle of a batch so we need to update the timeout.
-		lock (Buffer)
+		lock (SyncLock)
 		{
+			// Analyzer did not take into account thread safety.
+#pragma warning disable CA1508 // Avoid dead conditional code
 			if (_batch is not null) RefreshTimeout();
+#pragma warning restore CA1508 // Avoid dead conditional code
 		}
 
 		return this;
@@ -144,7 +147,7 @@ protected override bool TryPipeItems(bool flush)
 		if (Buffer?.Reader.Completion.IsCompleted != false)
 			return false;
 
-		lock (Buffer)
+		lock (SyncLock)
 		{
 			if (Buffer.Reader.Completion.IsCompleted) return false;
 

diff --git a/Open.ChannelExtensions/Readers/BufferingChannelReader.cs b/Open.ChannelExtensions/Readers/BufferingChannelReader.cs
@@ -17,6 +17,16 @@ public abstract class BufferingChannelReader<TIn, TOut> : ChannelReader<TOut>
 	/// </summary>
 	protected Channel<TOut>? Buffer { get; }
 
+	/// <summary>
+	/// The synchronization lock for the buffer.
+	/// </summary>
+	[SuppressMessage("Design", "CA1051:Do not declare visible instance fields", Justification = "<Pending>")]
+#if NET9_0_OR_GREATER
+	protected readonly System.Threading.Lock SyncLock = new();
+#else
+	protected readonly object SyncLock = new();
+#endif
+
 	/// <summary>
 	/// Base constructor for a BufferingChannelReader.
 	/// </summary>
@@ -39,7 +49,7 @@ protected BufferingChannelReader(ChannelReader<TIn> source, bool singleReader, b
 			{
 				OnBeforeFinalFlush();
 				// Need to be sure writing is done before we continue...
-				lock (Buffer)
+				lock (SyncLock)
 				{
 					/* When the source is complete,
 					 * we dump all remaining into the buffer