From ae46296f171953a95a03167571d3e156346cd8c6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Valentin=20Breu=C3=9F?= <vbreuss@gmail.com>
Date: Fri, 27 Mar 2026 23:42:54 +0100
Subject: [PATCH 1/2] chore: update Mockolate to v2.0

---
 Directory.Packages.props                      |  3 +-
 .../FileSystemTests.cs                        | 48 +++++++++----------
 2 files changed, 26 insertions(+), 25 deletions(-)

diff --git a/Directory.Packages.props b/Directory.Packages.props
index 6695349ea..5f773bf65 100644
--- a/Directory.Packages.props
+++ b/Directory.Packages.props
@@ -22,13 +22,14 @@
     <PackageVersion Include="coverlet.collector" Version="8.0.1" />
     <PackageVersion Include="GitHubActionsTestLogger" Version="3.0.1" />
     <PackageVersion Include="Microsoft.NET.Test.Sdk" Version="18.3.0" />
-    <PackageVersion Include="Mockolate" Version="1.5.4" />
+    <PackageVersion Include="Mockolate" Version="2.0.2" />
     <PackageVersion Include="NUnit" Version="4.5.1" />
     <PackageVersion Include="NUnit.Analyzers" Version="4.12.0" />
     <PackageVersion Include="NUnit3TestAdapter" Version="6.1.0" />
     <PackageVersion Include="PublicApiGenerator" Version="11.5.4"/>
     <PackageVersion Include="aweXpect" Version="2.31.0"/>
     <PackageVersion Include="aweXpect.Testably" Version="0.13.0"/>
+    <PackageVersion Include="aweXpect.Mockolate" Version="2.0.0"/>
   </ItemGroup>
   <ItemGroup>
     <PackageVersion Include="Nuke.Common" Version="10.1.0"/>
diff --git a/tests/TestableIO.System.IO.Abstractions.Wrappers.Tests/FileSystemTests.cs b/tests/TestableIO.System.IO.Abstractions.Wrappers.Tests/FileSystemTests.cs
index 7a99d2086..d64616dea 100644
--- a/tests/TestableIO.System.IO.Abstractions.Wrappers.Tests/FileSystemTests.cs
+++ b/tests/TestableIO.System.IO.Abstractions.Wrappers.Tests/FileSystemTests.cs
@@ -26,88 +26,88 @@ await That(memoryStream).HasLength().GreaterThan(0)
     [Test]
     public async Task Mock_File_Succeeds()
     {
-        var fileSystemMock = Mock.Create<IFileSystem>(fs =>
-            fs.Property.File.InitializeWith(Mock.Create<IFile>()));
+        var fileSystemMock = IFileSystem.CreateMock(fs =>
+            fs.File.InitializeWith(IFile.CreateMock()));
 
         await That(() =>
-            fileSystemMock.File.SetupMock.Method.ReadAllText(It.IsAny<string>()).Returns("")
+            fileSystemMock.File.Mock.Setup.ReadAllText(It.IsAny<string>()).Returns("")
         ).DoesNotThrow();
     }
 
     [Test]
     public async Task Mock_Directory_Succeeds()
     {
-        var fileSystemMock = Mock.Create<IFileSystem>(fs =>
-            fs.Property.Directory.InitializeWith(Mock.Create<IDirectory>()));
+        var fileSystemMock = IFileSystem.CreateMock(fs =>
+            fs.Directory.InitializeWith(IDirectory.CreateMock()));
 
         await That(() =>
-            fileSystemMock.Directory.SetupMock.Method.CreateDirectory(It.IsAny<string>())
+            fileSystemMock.Directory.Mock.Setup.CreateDirectory(It.IsAny<string>())
         ).DoesNotThrow();
     }
 
     [Test]
     public async Task Mock_FileInfo_Succeeds()
     {
-        var fileSystemMock = Mock.Create<IFileSystem>(fs =>
-            fs.Property.FileInfo.InitializeWith(Mock.Create<IFileInfoFactory>()));
+        var fileSystemMock = IFileSystem.CreateMock(fs =>
+            fs.FileInfo.InitializeWith(IFileInfoFactory.CreateMock()));
 
         await That(() =>
-            fileSystemMock.FileInfo.SetupMock.Method.New(It.IsAny<string>())
+            fileSystemMock.FileInfo.Mock.Setup.New(It.IsAny<string>())
         ).DoesNotThrow();
     }
 
     [Test]
     public async Task Mock_FileStream_Succeeds()
     {
-        var fileSystemMock = Mock.Create<IFileSystem>(fs =>
-            fs.Property.FileStream.InitializeWith(Mock.Create<IFileStreamFactory>()));
+        var fileSystemMock = IFileSystem.CreateMock(fs =>
+            fs.FileStream.InitializeWith(IFileStreamFactory.CreateMock()));
 
         await That(() =>
-            fileSystemMock.FileStream.SetupMock.Method.New(It.IsAny<string>(), It.IsAny<FileMode>())
+            fileSystemMock.FileStream.Mock.Setup.New(It.IsAny<string>(), It.IsAny<FileMode>())
         ).DoesNotThrow();
     }
 
     [Test]
     public async Task Mock_Path_Succeeds()
     {
-        var fileSystemMock = Mock.Create<IFileSystem>(fs =>
-            fs.Property.Path.InitializeWith(Mock.Create<IPath>()));
+        var fileSystemMock = IFileSystem.CreateMock(fs =>
+            fs.Path.InitializeWith(IPath.CreateMock()));
 
         await That(() =>
-            fileSystemMock.Path.SetupMock.Method.Combine(It.IsAny<string>(), It.IsAny<string>())
+            fileSystemMock.Path.Mock.Setup.Combine(It.IsAny<string>(), It.IsAny<string>())
         ).DoesNotThrow();
     }
 
     [Test]
     public async Task Mock_DirectoryInfo_Succeeds()
     {
-        var fileSystemMock = Mock.Create<IFileSystem>(fs =>
-            fs.Property.DirectoryInfo.InitializeWith(Mock.Create<IDirectoryInfoFactory>()));
+        var fileSystemMock = IFileSystem.CreateMock(fs =>
+            fs.DirectoryInfo.InitializeWith(IDirectoryInfoFactory.CreateMock()));
 
         await That(() =>
-            fileSystemMock.DirectoryInfo.SetupMock.Method.New(It.IsAny<string>())
+            fileSystemMock.DirectoryInfo.Mock.Setup.New(It.IsAny<string>())
         ).DoesNotThrow();
     }
 
     [Test]
     public async Task Mock_DriveInfo_Succeeds()
     {
-        var fileSystemMock = Mock.Create<IFileSystem>(fs =>
-            fs.Property.DriveInfo.InitializeWith(Mock.Create<IDriveInfoFactory>()));
+        var fileSystemMock = IFileSystem.CreateMock(fs =>
+            fs.DriveInfo.InitializeWith(IDriveInfoFactory.CreateMock()));
 
         await That(() =>
-            fileSystemMock.DriveInfo.SetupMock.Method.New(It.IsAny<string>())
+            fileSystemMock.DriveInfo.Mock.Setup.New(It.IsAny<string>())
         ).DoesNotThrow();
     }
 
     [Test]
     public async Task Mock_FileSystemWatcher_Succeeds()
     {
-        var fileSystemMock = Mock.Create<IFileSystem>(fs =>
-            fs.Property.FileSystemWatcher.InitializeWith(Mock.Create<IFileSystemWatcherFactory>()));
+        var fileSystemMock = IFileSystem.CreateMock(fs =>
+            fs.FileSystemWatcher.InitializeWith(IFileSystemWatcherFactory.CreateMock()));
 
         await That(() =>
-            fileSystemMock.FileSystemWatcher.SetupMock.Method.New(It.IsAny<string>())
+            fileSystemMock.FileSystemWatcher.Mock.Setup.New(It.IsAny<string>())
         ).DoesNotThrow();
     }
 }
\ No newline at end of file

From 1f06405c251cefd577f9cd95556462a4eaf322fc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Valentin=20Breu=C3=9F?= <vbreuss@gmail.com>
Date: Sat, 28 Mar 2026 07:14:03 +0100
Subject: [PATCH 2/2] Fix review issue

---
 Directory.Packages.props | 1 -
 1 file changed, 1 deletion(-)

diff --git a/Directory.Packages.props b/Directory.Packages.props
index 5f773bf65..5a7ae39f4 100644
--- a/Directory.Packages.props
+++ b/Directory.Packages.props
@@ -29,7 +29,6 @@
     <PackageVersion Include="PublicApiGenerator" Version="11.5.4"/>
     <PackageVersion Include="aweXpect" Version="2.31.0"/>
     <PackageVersion Include="aweXpect.Testably" Version="0.13.0"/>
-    <PackageVersion Include="aweXpect.Mockolate" Version="2.0.0"/>
   </ItemGroup>
   <ItemGroup>
     <PackageVersion Include="Nuke.Common" Version="10.1.0"/>