refactor: update and simplify references (#737)

Remove reference to "TestableIO.System.IO.Abstractions" and "Testably.Abstractions.FluentAssertions" Update references for "aweXpect" and "aweXpect.Testably" Adapt tests accordingly
Testably · Jan 30, 2025 · 1aef964 · 1aef964
1 parent 636dd17
commit 1aef964
Show file tree

Hide file tree

Showing 95 changed files with 659 additions and 702 deletions.
diff --git a/Directory.Packages.props b/Directory.Packages.props
@@ -6,7 +6,6 @@
     <PackageVersion Include="DotNet.Glob" Version="3.1.3"/>
     <PackageVersion Include="Newtonsoft.Json" Version="13.0.3"/>
     <PackageVersion Include="System.Linq.Async" Version="6.0.1"/>
-    <PackageVersion Include="TestableIO.System.IO.Abstractions" Version="21.3.1"/>
     <PackageVersion Include="System.IO.Compression" Version="4.3.0"/>
     <PackageVersion Include="System.IO.FileSystem.AccessControl" Version="5.0.0"/>
   </ItemGroup>
@@ -36,8 +35,8 @@
   <ItemGroup>
     <PackageVersion Include="AutoFixture.AutoNSubstitute" Version="5.0.0-preview0012"/>
     <PackageVersion Include="AutoFixture.Xunit3" Version="5.0.0-preview0012"/>
-    <PackageVersion Include="aweXpect" Version="0.20.0"/>
-    <PackageVersion Include="aweXpect.Testably" Version="0.3.0"/>
+    <PackageVersion Include="aweXpect" Version="0.22.0"/>
+    <PackageVersion Include="aweXpect.Testably" Version="0.4.0"/>
     <PackageVersion Include="FluentAssertions" Version="7.1.0"/>
     <PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.12.0"/>
     <PackageVersion Include="xunit.v3" Version="1.0.1"/>
@@ -51,7 +50,6 @@
   <ItemGroup>
     <PackageVersion Include="Testably.Abstractions" Version="3.2.4"/>
     <PackageVersion Include="Testably.Abstractions.Testing" Version="3.2.4"/>
-    <PackageVersion Include="Testably.Abstractions.FluentAssertions" Version="1.1.0"/>
   </ItemGroup>
   <ItemGroup>
     <PackageVersion Include="Meziantou.Analyzer" Version="2.0.186"/>

diff --git a/Pipeline/Build.Compile.cs b/Pipeline/Build.Compile.cs
@@ -44,6 +44,17 @@ partial class Build
 				Solution.Testably_Abstractions_Interface,
 				Solution.Testably_Abstractions_FileSystem_Interface,
 			];
+
+			string preRelease = "-CI";
+			if (GitHubActions == null)
+			{
+				preRelease = "-DEV";
+			}
+			else if (GitHubActions.Ref.StartsWith("refs/tags/", StringComparison.OrdinalIgnoreCase) == true)
+			{
+				int preReleaseIndex = GitHubActions.Ref.IndexOf('-');
+				preRelease = preReleaseIndex > 0 ? GitHubActions.Ref[preReleaseIndex..] : "";
+			}
 
 			CoreVersion = AssemblyVersion.FromGitVersion(GitVersionTasks.GitVersion(s => s
 					.SetFramework("net8.0")
@@ -52,7 +63,7 @@ partial class Build
 					.DisableProcessOutputLogging()
 					.SetUpdateAssemblyInfo(false)
 					.AddProcessAdditionalArguments("/overrideconfig", "tag-prefix=core/v"))
-				.Result);
+				.Result, preRelease);
 
 			GitVersion gitVersion = GitVersionTasks.GitVersion(s => s
 					.SetFramework("net8.0")
@@ -62,7 +73,7 @@ partial class Build
 					.SetUpdateAssemblyInfo(false))
 				.Result;
 
-			MainVersion = AssemblyVersion.FromGitVersion(gitVersion);
+			MainVersion = AssemblyVersion.FromGitVersion(gitVersion, preRelease);
 			SemVer = gitVersion.SemVer;
 			BranchName = gitVersion.BranchName;
 
@@ -121,7 +132,7 @@ partial class Build
 				.SetConfiguration(Configuration)
 				.EnableNoLogo()
 				.EnableNoRestore()
-				.SetVersion(MainVersion!.FileVersion)
+				.SetVersion(MainVersion!.FileVersion + CoreVersion.PreRelease)
 				.SetAssemblyVersion(MainVersion!.FileVersion)
 				.SetFileVersion(MainVersion!.FileVersion));
 
@@ -135,23 +146,23 @@ partial class Build
 					.EnableNoLogo()
 					.EnableNoRestore()
 					.SetProcessAdditionalArguments($"/p:SolutionDir={RootDirectory}/")
-					.SetVersion(CoreVersion!.FileVersion)
+					.SetVersion(CoreVersion!.FileVersion + CoreVersion.PreRelease)
 					.SetAssemblyVersion(CoreVersion!.FileVersion)
 					.SetFileVersion(CoreVersion!.FileVersion));
 			}
 		});
 
-	public record AssemblyVersion(string FileVersion, string InformationalVersion)
+	public record AssemblyVersion(string FileVersion, string InformationalVersion, string PreRelease)
 	{
 		[return: NotNullIfNotNull(nameof(gitVersion))]
-		public static AssemblyVersion? FromGitVersion(GitVersion gitVersion)
+		public static AssemblyVersion? FromGitVersion(GitVersion gitVersion, string preRelease)
 		{
 			if (gitVersion is null)
 			{
 				return null;
 			}
 
-			return new AssemblyVersion(gitVersion.AssemblySemVer, gitVersion.InformationalVersion);
+			return new AssemblyVersion(gitVersion.AssemblySemVer, gitVersion.InformationalVersion, preRelease);
 		}
 	}
 

diff --git a/Source/Testably.Abstractions.FileSystem.Interface/IFileStreamFactory.cs b/Source/Testably.Abstractions.FileSystem.Interface/IFileStreamFactory.cs
@@ -38,7 +38,7 @@ FileSystemStream New(string path, FileMode mode, FileAccess access,
 	FileSystemStream New(string path, FileMode mode, FileAccess access,
 		FileShare share, int bufferSize, FileOptions options);
 
-#if FEATURE_FILESTREAM_OPTIONS
+#if FEATURE_FILESYSTEM_STREAM_OPTIONS
 	    /// <inheritdoc cref="FileStream(string, FileStreamOptions)" />
 	    FileSystemStream New(string path, FileStreamOptions options);
 #endif

diff --git a/Source/Testably.Abstractions.FileSystem.Interface/IFileSystemInfo.cs b/Source/Testably.Abstractions.FileSystem.Interface/IFileSystemInfo.cs
@@ -43,7 +43,7 @@ public interface IFileSystemInfo
         /// <inheritdoc cref="FileSystemInfo.LastWriteTimeUtc" />
         DateTime LastWriteTimeUtc { get; set; }
 
-#if FEATURE_FILE_SYSTEM_INFO_LINK_TARGET
+#if FEATURE_FILESYSTEM_LINK
         /// <inheritdoc cref="FileSystemInfo.LinkTarget" />
         string? LinkTarget { get; }
 #endif

diff --git a/Source/Testably.Abstractions.Interface/Polyfills/SupportedOSPlatformAttribute.cs b/Source/Testably.Abstractions.Interface/Polyfills/SupportedOSPlatformAttribute.cs
diff --git a/Source/Testably.Abstractions.Interface/Testably.Abstractions.Interface.csproj b/Source/Testably.Abstractions.Interface/Testably.Abstractions.Interface.csproj
@@ -18,7 +18,7 @@
 	</ItemGroup>
 
 	<ItemGroup>
-		<PackageReference Include="TestableIO.System.IO.Abstractions" />
+	  <ProjectReference Include="..\Testably.Abstractions.FileSystem.Interface\Testably.Abstractions.FileSystem.Interface.csproj" />
 	</ItemGroup>
 
 </Project>
diff --git a/...bly.Abstractions.Api.Tests/Expected/Testably.Abstractions.FileSystem.Interface_net6.0.txt b/...bly.Abstractions.Api.Tests/Expected/Testably.Abstractions.FileSystem.Interface_net6.0.txt
@@ -264,6 +264,7 @@ namespace System.IO.Abstractions
     {
         System.IO.Abstractions.FileSystemStream New(Microsoft.Win32.SafeHandles.SafeFileHandle handle, System.IO.FileAccess access);
         System.IO.Abstractions.FileSystemStream New(string path, System.IO.FileMode mode);
+        System.IO.Abstractions.FileSystemStream New(string path, System.IO.FileStreamOptions options);
         System.IO.Abstractions.FileSystemStream New(Microsoft.Win32.SafeHandles.SafeFileHandle handle, System.IO.FileAccess access, int bufferSize);
         System.IO.Abstractions.FileSystemStream New(string path, System.IO.FileMode mode, System.IO.FileAccess access);
         System.IO.Abstractions.FileSystemStream New(Microsoft.Win32.SafeHandles.SafeFileHandle handle, System.IO.FileAccess access, int bufferSize, bool isAsync);
@@ -318,6 +319,7 @@ namespace System.IO.Abstractions
         System.DateTime LastAccessTimeUtc { get; set; }
         System.DateTime LastWriteTime { get; set; }
         System.DateTime LastWriteTimeUtc { get; set; }
+        string? LinkTarget { get; }
         string Name { get; }
         void CreateAsSymbolicLink(string pathToTarget);
         void Delete();

diff --git a/...bly.Abstractions.Api.Tests/Expected/Testably.Abstractions.FileSystem.Interface_net8.0.txt b/...bly.Abstractions.Api.Tests/Expected/Testably.Abstractions.FileSystem.Interface_net8.0.txt
@@ -290,6 +290,7 @@ namespace System.IO.Abstractions
     {
         System.IO.Abstractions.FileSystemStream New(Microsoft.Win32.SafeHandles.SafeFileHandle handle, System.IO.FileAccess access);
         System.IO.Abstractions.FileSystemStream New(string path, System.IO.FileMode mode);
+        System.IO.Abstractions.FileSystemStream New(string path, System.IO.FileStreamOptions options);
         System.IO.Abstractions.FileSystemStream New(Microsoft.Win32.SafeHandles.SafeFileHandle handle, System.IO.FileAccess access, int bufferSize);
         System.IO.Abstractions.FileSystemStream New(string path, System.IO.FileMode mode, System.IO.FileAccess access);
         System.IO.Abstractions.FileSystemStream New(Microsoft.Win32.SafeHandles.SafeFileHandle handle, System.IO.FileAccess access, int bufferSize, bool isAsync);
@@ -344,6 +345,7 @@ namespace System.IO.Abstractions
         System.DateTime LastAccessTimeUtc { get; set; }
         System.DateTime LastWriteTime { get; set; }
         System.DateTime LastWriteTimeUtc { get; set; }
+        string? LinkTarget { get; }
         string Name { get; }
         [set: System.Runtime.Versioning.UnsupportedOSPlatform("windows")]
         System.IO.UnixFileMode UnixFileMode { get; set; }

diff --git a/...bly.Abstractions.Api.Tests/Expected/Testably.Abstractions.FileSystem.Interface_net9.0.txt b/...bly.Abstractions.Api.Tests/Expected/Testably.Abstractions.FileSystem.Interface_net9.0.txt
@@ -304,6 +304,7 @@ namespace System.IO.Abstractions
     {
         System.IO.Abstractions.FileSystemStream New(Microsoft.Win32.SafeHandles.SafeFileHandle handle, System.IO.FileAccess access);
         System.IO.Abstractions.FileSystemStream New(string path, System.IO.FileMode mode);
+        System.IO.Abstractions.FileSystemStream New(string path, System.IO.FileStreamOptions options);
         System.IO.Abstractions.FileSystemStream New(Microsoft.Win32.SafeHandles.SafeFileHandle handle, System.IO.FileAccess access, int bufferSize);
         System.IO.Abstractions.FileSystemStream New(string path, System.IO.FileMode mode, System.IO.FileAccess access);
         System.IO.Abstractions.FileSystemStream New(Microsoft.Win32.SafeHandles.SafeFileHandle handle, System.IO.FileAccess access, int bufferSize, bool isAsync);
@@ -358,6 +359,7 @@ namespace System.IO.Abstractions
         System.DateTime LastAccessTimeUtc { get; set; }
         System.DateTime LastWriteTime { get; set; }
         System.DateTime LastWriteTimeUtc { get; set; }
+        string? LinkTarget { get; }
         string Name { get; }
         [set: System.Runtime.Versioning.UnsupportedOSPlatform("windows")]
         System.IO.UnixFileMode UnixFileMode { get; set; }

diff --git a/...stably.Abstractions.Api.Tests/Expected/Testably.Abstractions.Interface_netstandard2.0.txt b/...stably.Abstractions.Api.Tests/Expected/Testably.Abstractions.Interface_netstandard2.0.txt
@@ -41,15 +41,6 @@ namespace Testably.Abstractions
         Testably.Abstractions.TimeSystem.ITimerFactory Timer { get; }
     }
 }
-namespace Testably.Abstractions.Polyfills
-{
-    [System.AttributeUsage(System.AttributeTargets.Assembly | System.AttributeTargets.Module | System.AttributeTargets.Class | System.AttributeTargets.Struct | System.AttributeTargets.Enum | System.AttributeTargets.Constructor | System.AttributeTargets.Method | System.AttributeTargets.Property | System.AttributeTargets.Field | System.AttributeTargets.Event | System.AttributeTargets.Interface, AllowMultiple=true, Inherited=false)]
-    public sealed class SupportedOSPlatformAttribute : System.Attribute
-    {
-        public SupportedOSPlatformAttribute(string platformName) { }
-        public string PlatformName { get; }
-    }
-}
 namespace Testably.Abstractions.RandomSystem
 {
     public interface IGuid : Testably.Abstractions.RandomSystem.IRandomSystemEntity

diff --git a/...stably.Abstractions.Api.Tests/Expected/Testably.Abstractions.Interface_netstandard2.1.txt b/...stably.Abstractions.Api.Tests/Expected/Testably.Abstractions.Interface_netstandard2.1.txt
@@ -50,15 +50,6 @@ namespace Testably.Abstractions
         Testably.Abstractions.TimeSystem.ITimerFactory Timer { get; }
     }
 }
-namespace Testably.Abstractions.Polyfills
-{
-    [System.AttributeUsage(System.AttributeTargets.Assembly | System.AttributeTargets.Module | System.AttributeTargets.Class | System.AttributeTargets.Struct | System.AttributeTargets.Enum | System.AttributeTargets.Constructor | System.AttributeTargets.Method | System.AttributeTargets.Property | System.AttributeTargets.Field | System.AttributeTargets.Event | System.AttributeTargets.Interface, AllowMultiple=true, Inherited=false)]
-    public sealed class SupportedOSPlatformAttribute : System.Attribute
-    {
-        public SupportedOSPlatformAttribute(string platformName) { }
-        public string PlatformName { get; }
-    }
-}
 namespace Testably.Abstractions.RandomSystem
 {
     public interface IGuid : Testably.Abstractions.RandomSystem.IRandomSystemEntity

diff --git a/Tests/Api/Testably.Abstractions.Api.Tests/Testably.Abstractions.Api.Tests.csproj b/Tests/Api/Testably.Abstractions.Api.Tests/Testably.Abstractions.Api.Tests.csproj
@@ -6,7 +6,6 @@
 
 	<ItemGroup>
 		<PackageReference Include="PublicApiGenerator" />
-		<PackageReference Include="TestableIO.System.IO.Abstractions" />
 	</ItemGroup>
 
 </Project>
diff --git a/Tests/Testably.Abstractions.AccessControl.Tests/DirectoryAclExtensionsTests.cs b/Tests/Testably.Abstractions.AccessControl.Tests/DirectoryAclExtensionsTests.cs
@@ -71,7 +71,7 @@ public async Task GetAccessControl_ShouldReturnSetResult()
 		DirectorySecurity result =
 			FileSystem.Directory.GetAccessControl("foo");
 
-		await That(result).Is(originalResult);
+		await That(result).IsEqualTo(originalResult);
 		#pragma warning restore CA1416
 	}
 
@@ -108,7 +108,7 @@ public async Task GetAccessControl_WithAccessControlSections_ShouldReturnSetResu
 		DirectorySecurity result =
 			FileSystem.Directory.GetAccessControl("foo", AccessControlSections.None);
 
-		await That(result).Is(originalResult);
+		await That(result).IsEqualTo(originalResult);
 		#pragma warning restore CA1416
 	}
 
@@ -150,8 +150,8 @@ public async Task SetAccessControl_ShouldNotUpdateTimes()
 		DateTime lastAccessTimeUtc = FileSystem.File.GetLastAccessTimeUtc("foo.txt");
 		DateTime lastWriteTimeUtc = FileSystem.File.GetLastWriteTimeUtc("foo.txt");
 
-		await That(creationTimeUtc).Is(previousCreationTimeUtc);
-		await That(lastAccessTimeUtc).Is(previousLastAccessTimeUtc);
-		await That(lastWriteTimeUtc).Is(previousLastWriteTimeUtc);
+		await That(creationTimeUtc).IsEqualTo(previousCreationTimeUtc);
+		await That(lastAccessTimeUtc).IsEqualTo(previousLastAccessTimeUtc);
+		await That(lastWriteTimeUtc).IsEqualTo(previousLastWriteTimeUtc);
 	}
 }
diff --git a/Tests/Testably.Abstractions.AccessControl.Tests/DirectoryInfoAclExtensionsTests.cs b/Tests/Testably.Abstractions.AccessControl.Tests/DirectoryInfoAclExtensionsTests.cs
@@ -88,7 +88,7 @@ public async Task GetAccessControl_ShouldReturnSetResult()
 		DirectorySecurity result =
 			FileSystem.DirectoryInfo.New("foo").GetAccessControl();
 
-		await That(result).Is(originalResult);
+		await That(result).IsEqualTo(originalResult);
 		#pragma warning restore CA1416
 	}
 
@@ -141,7 +141,7 @@ public async Task GetAccessControl_WithAccessControlSections_ShouldReturnSetResu
 		DirectorySecurity result =
 			FileSystem.DirectoryInfo.New("foo").GetAccessControl(AccessControlSections.None);
 
-		await That(result).Is(originalResult);
+		await That(result).IsEqualTo(originalResult);
 		#pragma warning restore CA1416
 	}
 
@@ -184,8 +184,8 @@ public async Task SetAccessControl_ShouldNotUpdateTimes(string path)
 		DateTime lastAccessTimeUtc = FileSystem.File.GetLastAccessTimeUtc(path);
 		DateTime lastWriteTimeUtc = FileSystem.File.GetLastWriteTimeUtc(path);
 
-		await That(creationTimeUtc).Is(previousCreationTimeUtc);
-		await That(lastAccessTimeUtc).Is(previousLastAccessTimeUtc);
-		await That(lastWriteTimeUtc).Is(previousLastWriteTimeUtc);
+		await That(creationTimeUtc).IsEqualTo(previousCreationTimeUtc);
+		await That(lastAccessTimeUtc).IsEqualTo(previousLastAccessTimeUtc);
+		await That(lastWriteTimeUtc).IsEqualTo(previousLastWriteTimeUtc);
 	}
 }
diff --git a/Tests/Testably.Abstractions.AccessControl.Tests/ExceptionMissingFileTests.cs b/Tests/Testably.Abstractions.AccessControl.Tests/ExceptionMissingFileTests.cs
@@ -33,7 +33,7 @@ await That(exception).IsNull().Because(
 			case MethodType.GetAccessControl:
 				await That(exception).Is<DirectoryNotFoundException>()
 					.Because($"\n{exceptionType} on {baseType}\n was called with a missing directory")
-					.Which(e => e.HResult, h => h.Is(-2147024893));
+					.Which(e => e.HResult, h => h.IsEqualTo(-2147024893));
 				break;
 			case MethodType.SetAccessControl:
 				await That(exception).IsNull()
@@ -68,7 +68,7 @@ await That(exception).IsNull()
 			case MethodType.GetAccessControl:
 				await That(exception).Is<DirectoryNotFoundException>()
 					.Because($"\n{exceptionType} on {baseType}\n was called with a missing file")
-					.Which(e => e.HResult, h => h.Is(-2147024893));
+					.Which(e => e.HResult, h => h.IsEqualTo(-2147024893));
 				break;
 			case MethodType.SetAccessControl:
 				await That(exception).IsNull()
@@ -99,12 +99,12 @@ public async Task FileOperations_WhenDirectoryIsMissing_ShouldThrowDirectoryNotF
 			case MethodType.Create:
 				await That(exception).Is<UnauthorizedAccessException>()
 					.Because($"\n{exceptionType} on {baseType}\n was called with a missing directory")
-					.Which(e => e.HResult, h => h.Is(-2147024891));
+					.Which(e => e.HResult, h => h.IsEqualTo(-2147024891));
 				break;
 			case MethodType.GetAccessControl:
 				await That(exception).Is<FileNotFoundException>()
 					.Because($"\n{exceptionType} on {baseType}\n was called with a missing directory")
-					.Which(e => e.HResult, h => h.Is(-2147024894));
+					.Which(e => e.HResult, h => h.IsEqualTo(-2147024894));
 				break;
 			case MethodType.SetAccessControl:
 				await That(exception).IsNull()
@@ -139,7 +139,7 @@ await That(exception).IsNull()
 			case MethodType.GetAccessControl:
 				await That(exception).Is<FileNotFoundException>()
 					.Because($"\n{exceptionType} on {baseType}\n was called with a missing file")
-					.Which(e => e.HResult, h => h.Is(-2147024894));
+					.Which(e => e.HResult, h => h.IsEqualTo(-2147024894));
 				break;
 			case MethodType.SetAccessControl:
 				await That(exception).IsNull()

diff --git a/Tests/Testably.Abstractions.AccessControl.Tests/FileAclExtensionsTests.cs b/Tests/Testably.Abstractions.AccessControl.Tests/FileAclExtensionsTests.cs
@@ -54,7 +54,7 @@ public async Task GetAccessControl_ShouldReturnSetResult()
 		FileSecurity result =
 			FileSystem.File.GetAccessControl("foo");
 
-		await That(result).Is(originalResult);
+		await That(result).IsEqualTo(originalResult);
 		#pragma warning restore CA1416
 	}
 
@@ -107,7 +107,7 @@ public async Task GetAccessControl_WithAccessControlSections_ShouldReturnSetResu
 		FileSecurity result =
 			FileSystem.File.GetAccessControl("foo", AccessControlSections.None);
 
-		await That(result).Is(originalResult);
+		await That(result).IsEqualTo(originalResult);
 		#pragma warning restore CA1416
 	}
 

diff --git a/Tests/Testably.Abstractions.AccessControl.Tests/FileInfoAclExtensionsTests.cs b/Tests/Testably.Abstractions.AccessControl.Tests/FileInfoAclExtensionsTests.cs
@@ -57,7 +57,7 @@ public async Task GetAccessControl_ShouldReturnSetResult()
 		FileSecurity result =
 			FileSystem.FileInfo.New("foo").GetAccessControl();
 
-		await That(result).Is(originalResult);
+		await That(result).IsEqualTo(originalResult);
 		#pragma warning restore CA1416
 	}
 
@@ -112,7 +112,7 @@ public async Task GetAccessControl_WithAccessControlSections_ShouldReturnSetResu
 		FileSecurity result =
 			FileSystem.FileInfo.New("foo").GetAccessControl(AccessControlSections.None);
 
-		await That(result).Is(originalResult);
+		await That(result).IsEqualTo(originalResult);
 		#pragma warning restore CA1416
 	}