fix: Fixed compatibility with v22.x of TestableIO (fix #81) (#85)

gigi81 · web-flow · commit 767c6877d815 · 2025-02-28T21:47:17.000Z
diff --git a/.editorconfig b/.editorconfig
@@ -9,3 +9,7 @@ end_of_line = CRLF
 [*.cs]
 indent_style = space
 indent_size = 4
+
+dotnet_diagnostic.NUnit2003.severity = suggestion
+dotnet_diagnostic.NUnit2004.severity = suggestion
+dotnet_diagnostic.NUnit2005.severity = suggestion
diff --git a/.gitignore b/.gitignore
@@ -577,3 +577,4 @@ FodyWeavers.xsd
 # Additional files built by Visual Studio
 
 # End of https://www.toptal.com/developers/gitignore/api/csharp,visualstudio,visualstudiocode
+*.sh
diff --git a/Directory.Build.props b/Directory.Build.props
@@ -9,20 +9,20 @@
     <IncludeSymbols>true</IncludeSymbols>
     <SymbolPackageFormat>snupkg</SymbolPackageFormat>
     <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
-    <LangVersion>9.0</LangVersion>
     <PackageTags>testing</PackageTags>
     <PackageProjectUrl>https://github.com/System-IO-Abstractions/System.IO.Abstractions.Extensions</PackageProjectUrl>
     <RepositoryUrl>https://github.com/System-IO-Abstractions/System.IO.Abstractions.Extensions.git</RepositoryUrl>
     <RepositoryType>git</RepositoryType>
     <RepositoryRoot>$(MSBuildThisFileDirectory)</RepositoryRoot>
     <PackageLicenseExpression>MIT</PackageLicenseExpression>
+    <PackageReadmeFile>README.md</PackageReadmeFile>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="Nerdbank.GitVersioning" Version="3.6.133">
+    <PackageReference Include="Nerdbank.GitVersioning" Version="3.7.115">
       <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
       <PrivateAssets>all</PrivateAssets>
     </PackageReference>
-    <PackageReference Include="SauceControl.InheritDoc" Version="2.0.1" PrivateAssets="all" />
+    <PackageReference Include="SauceControl.InheritDoc" Version="2.0.2" PrivateAssets="all" />
     <PackageReference Include="Microsoft.SourceLink.GitHub" Version="8.0.0">
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
       <PrivateAssets>all</PrivateAssets>
diff --git a/src/System.IO.Abstractions.Extensions/IFileInfoAsyncExtensions.cs b/src/System.IO.Abstractions.Extensions/IFileInfoAsyncExtensions.cs
@@ -1,4 +1,4 @@
-﻿#if NETSTANDARD2_1_OR_GREATER || NET6_0_OR_GREATER
+﻿#if NET8_0_OR_GREATER
 #nullable enable
 
 using System.Collections.Generic;
@@ -85,12 +85,12 @@ public static async IAsyncEnumerable<string> EnumerateLinesAsync(this IFileInfo
                 ? new StreamReader(stream)
                 : new StreamReader(stream, encoding);
 
-            var line = await reader.ReadLineAsync();
+            var line = await reader.ReadLineAsync(cancellationToken);
             while (line != null)
             {
                 yield return line;
                 cancellationToken.ThrowIfCancellationRequested();                
-                line = await reader.ReadLineAsync();
+                line = await reader.ReadLineAsync(cancellationToken);
             }
         }
     }
diff --git a/src/System.IO.Abstractions.Extensions/System.IO.Abstractions.Extensions.csproj b/src/System.IO.Abstractions.Extensions/System.IO.Abstractions.Extensions.csproj
@@ -2,15 +2,21 @@
 
 	<PropertyGroup>
 		<PackageId>TestableIO.System.IO.Abstractions.Extensions</PackageId>
-		<TargetFrameworks>net8.0;net6.0;netstandard2.1;netstandard2.0;net462</TargetFrameworks>
+		<TargetFrameworks>net8.0;netstandard2.1;netstandard2.0;net472</TargetFrameworks>
 		<Description>Convenience functionalities on top of System.IO.Abstractions</Description>
 		<RootNamespace>System.IO.Abstractions</RootNamespace>
 		<PackageReleaseNotes>$([System.IO.File]::ReadAllText("$(MSBuildProjectDirectory)/../../ReleaseNotes.md"))</PackageReleaseNotes>
+		<LangVersion>9.0</LangVersion>
+		<PackageReadmeFile>README.md</PackageReadmeFile>
 	</PropertyGroup>
 
+	<ItemGroup>
+		<None Include="$(MSBuildThisFileDirectory)../../README.md" Pack="true" PackagePath="\"/>
+	</ItemGroup>
+
 	<ItemGroup>
 	  <!-- Dependencies of TestableIO.System.IO.Abstractions changed in 22.0 -->
-	  <PackageReference Include="TestableIO.System.IO.Abstractions" Version="[17.*,22.0.0)" />
+	  <PackageReference Include="TestableIO.System.IO.Abstractions" Version="[22.*,)" />
 	</ItemGroup>
 	
 	<ItemGroup>
diff --git a/tests/Directory.Build.props b/tests/Directory.Build.props
@@ -9,13 +9,4 @@
     -->
     <CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies>
   </PropertyGroup>
-
-  <ItemGroup>
-    <PackageReference Include="NUnit" Version="3.14.0" />
-    <PackageReference Include="NUnit3TestAdapter" Version="4.5.0" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.9.0" />
-    <PackageReference Include="coverlet.collector" Version="6.0.1" />
-    <PackageReference Include="GitHubActionsTestLogger" Version="2.3.3" />
-    <PackageReference Include="Snapshooter.NUnit" Version="0.13.0" />
-  </ItemGroup>
 </Project>
diff --git a/tests/System.IO.Abstractions.Extensions.Tests/DirectoryInfoExtensionsTests.cs b/tests/System.IO.Abstractions.Extensions.Tests/DirectoryInfoExtensionsTests.cs
@@ -1,5 +1,6 @@
 ﻿using NUnit.Framework;
 using System.Collections.Generic;
+using Assert = NUnit.Framework.Legacy.ClassicAssert;
 
 namespace System.IO.Abstractions.Extensions.Tests
 {
diff --git a/tests/System.IO.Abstractions.Extensions.Tests/DisposableDirectoryTests.cs b/tests/System.IO.Abstractions.Extensions.Tests/DisposableDirectoryTests.cs
@@ -1,4 +1,5 @@
 ﻿using NUnit.Framework;
+using Assert = NUnit.Framework.Legacy.ClassicAssert;
 
 namespace System.IO.Abstractions.Extensions.Tests
 {
@@ -8,7 +9,7 @@ public class DisposableDirectoryTests
         [Test]
         public void DisposableDirectory_Throws_ArgumentNullException_For_Null_IDirectoryInfo_Test()
         {
-            Assert.Throws<ArgumentNullException>(() => new DisposableDirectory(null!));
+            Assert.Throws<ArgumentNullException>(() => new DisposableDirectory(null));
         }
 
         [Test]
diff --git a/tests/System.IO.Abstractions.Extensions.Tests/DisposableFileTests.cs b/tests/System.IO.Abstractions.Extensions.Tests/DisposableFileTests.cs
@@ -1,4 +1,5 @@
 ﻿using NUnit.Framework;
+using Assert = NUnit.Framework.Legacy.ClassicAssert;
 
 namespace System.IO.Abstractions.Extensions.Tests
 {
@@ -8,7 +9,7 @@ public class DisposableFileTests
         [Test]
         public void DisposableFile_Throws_ArgumentNullException_For_Null_IFileInfo_Test()
         {
-            Assert.Throws<ArgumentNullException>(() => new DisposableFile(null!));
+            Assert.Throws<ArgumentNullException>(() => new DisposableFile(null));
         }
 
         [Test]
diff --git a/tests/System.IO.Abstractions.Extensions.Tests/FileInfoExtensionsTests.cs b/tests/System.IO.Abstractions.Extensions.Tests/FileInfoExtensionsTests.cs
@@ -1,6 +1,7 @@
 ﻿using NUnit.Framework;
 using System.Linq;
 using System.Text;
+using Assert = NUnit.Framework.Legacy.ClassicAssert;
 
 namespace System.IO.Abstractions.Extensions.Tests
 {
diff --git a/tests/System.IO.Abstractions.Extensions.Tests/FileSystemExtensionsTests.cs b/tests/System.IO.Abstractions.Extensions.Tests/FileSystemExtensionsTests.cs
@@ -1,4 +1,5 @@
 ﻿using NUnit.Framework;
+using Assert = NUnit.Framework.Legacy.ClassicAssert;
 
 namespace System.IO.Abstractions.Extensions.Tests
 {
@@ -42,7 +43,7 @@ public void CurrentDirectoryTest()
             var fullName = fs.CurrentDirectory().FullName;
 
             Assert.IsFalse(String.IsNullOrWhiteSpace(fullName));
-            Assert.AreEqual(Environment.CurrentDirectory, fullName);
+            NUnit.Framework.Assert.That(fullName, Is.EqualTo(Environment.CurrentDirectory));
         }
 
         [Test]
@@ -119,14 +120,14 @@ public void CreateDisposableFile_Temp_Path_Test()
             {
                 path = file.FullName;
 
-                Assert.IsTrue(file.Exists, "File should exist");
+                Assert.That(file.Exists, Is.True, "File should exist");
                 Assert.IsTrue(
                     path.StartsWith(fs.Path.GetTempPath(), StringComparison.Ordinal),
                     "File should be in temp path");
             }
 
             // Assert file is deleted
-            Assert.IsFalse(fs.File.Exists(path), "File should not exist");
+            Assert.That(fs.File.Exists(path), Is.False, "File should not exist");
         }
 
         [Test]
diff --git a/tests/System.IO.Abstractions.Extensions.Tests/System.IO.Abstractions.Extensions.Tests.csproj b/tests/System.IO.Abstractions.Extensions.Tests/System.IO.Abstractions.Extensions.Tests.csproj
@@ -2,14 +2,24 @@
 
 	<PropertyGroup>
 		<TargetFrameworks>net9.0;net8.0</TargetFrameworks>
-		<TargetFrameworks Condition="!$([MSBuild]::IsOsUnixLike())">$(TargetFrameworks);net462</TargetFrameworks>
+		<TargetFrameworks Condition="!$([MSBuild]::IsOsUnixLike())">$(TargetFrameworks);net472</TargetFrameworks>
 		<IsPackable>false</IsPackable>
 		<IsTestable>true</IsTestable>
 	</PropertyGroup>
-
+	
 	<ItemGroup>
-		<PackageReference Include="TestableIO.System.IO.Abstractions.Wrappers" Version="21.3.1" />
 		<ProjectReference Include="..\..\src\System.IO.Abstractions.Extensions\System.IO.Abstractions.Extensions.csproj" />
 	</ItemGroup>
+	
+	<ItemGroup>
+		<PackageReference Include="TestableIO.System.IO.Abstractions.Wrappers" Version="22.0.10" />
+		<PackageReference Include="NUnit" Version="4.3.2" />
+		<PackageReference Include="NUnit.Analyzers" Version="4.3.0" />
+		<PackageReference Include="NUnit3TestAdapter" Version="5.0.0" />
+		<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.13.0" />
+		<PackageReference Include="coverlet.collector" Version="6.0.4" />
+		<PackageReference Include="GitHubActionsTestLogger" Version="2.4.1" />
+		<PackageReference Include="Snapshooter.NUnit" Version="1.0.1" />
+	</ItemGroup>
 
 </Project>
diff --git a/version.json b/version.json
@@ -1,6 +1,6 @@
 {
   "$schema": "https://raw.githubusercontent.com/AArnott/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json",
-  "version": "2.2",
+  "version": "22.0",
   "assemblyVersion": {
     "precision": "major"
   },

Original file line number	Diff line number	Diff line change
`@@ -577,3 +577,4 @@ FodyWeavers.xsd`
`577`	`577`	`# Additional files built by Visual Studio`
`578`	`578`
`579`	`579`	`# End of https://www.toptal.com/developers/gitignore/api/csharp,visualstudio,visualstudiocode`
	`580`	`+*.sh`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-#if NETSTANDARD2_1_OR_GREATER \|\| NET6_0_OR_GREATER`
	`1`	`+#if NET8_0_OR_GREATER`
`2`	`2`	`#nullable enable`
`3`	`3`
`4`	`4`	`using System.Collections.Generic;`
`@@ -85,12 +85,12 @@ public static async IAsyncEnumerable<string> EnumerateLinesAsync(this IFileInfo`
`85`	`85`	`? new StreamReader(stream)`
`86`	`86`	`: new StreamReader(stream, encoding);`
`87`	`87`
`88`		`- var line = await reader.ReadLineAsync();`
	`88`	`+ var line = await reader.ReadLineAsync(cancellationToken);`
`89`	`89`	`while (line != null)`
`90`	`90`	`{`
`91`	`91`	`yield return line;`
`92`	`92`	`cancellationToken.ThrowIfCancellationRequested();`
`93`		`- line = await reader.ReadLineAsync();`
	`93`	`+ line = await reader.ReadLineAsync(cancellationToken);`
`94`	`94`	`}`
`95`	`95`	`}`
`96`	`96`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,6 @@`
`1`	`1`	`using NUnit.Framework;`
`2`	`2`	`using System.Collections.Generic;`
	`3`	`+using Assert = NUnit.Framework.Legacy.ClassicAssert;`
`3`	`4`
`4`	`5`	`namespace System.IO.Abstractions.Extensions.Tests`
`5`	`6`	`{`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,5 @@`
`1`	`1`	`using NUnit.Framework;`
	`2`	`+using Assert = NUnit.Framework.Legacy.ClassicAssert;`
`2`	`3`
`3`	`4`	`namespace System.IO.Abstractions.Extensions.Tests`
`4`	`5`	`{`
`@@ -8,7 +9,7 @@ public class DisposableDirectoryTests`
`8`	`9`	`[Test]`
`9`	`10`	`public void DisposableDirectory_Throws_ArgumentNullException_For_Null_IDirectoryInfo_Test()`
`10`	`11`	`{`
`11`		`- Assert.Throws<ArgumentNullException>(() => new DisposableDirectory(null!));`
	`12`	`+ Assert.Throws<ArgumentNullException>(() => new DisposableDirectory(null));`
`12`	`13`	`}`
`13`	`14`
`14`	`15`	`[Test]`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,7 @@`
`1`	`1`	`using NUnit.Framework;`
`2`	`2`	`using System.Linq;`
`3`	`3`	`using System.Text;`
	`4`	`+using Assert = NUnit.Framework.Legacy.ClassicAssert;`
`4`	`5`
`5`	`6`	`namespace System.IO.Abstractions.Extensions.Tests`
`6`	`7`	`{`