fix: update version of TestableIO.System.IO.Abstractions to "17.*" (#27)

* Update version to 17.*

* Use TestableIO references

* Update build pipelines to setup required .NET versions

Co-authored-by: Valentin Breuß <[email protected]>

Author: vbreuss

.github/workflows/ci.yml

@@ -17,14 +17,13 @@ jobs:
         uses: actions/checkout@v3
         with:
           fetch-depth: 0
-      - name: Setup .NET Core 2.1
-        uses: actions/setup-dotnet@v2
-        with:
-          dotnet-version: "2.1.x"
-      - name: Setup .NET Core 3.1
-        uses: actions/setup-dotnet@v2
+      - name: Setup .NET
+        uses: actions/setup-dotnet@v3
         with:
-          dotnet-version: "3.1.x"
+          dotnet-version: | 
+            3.1.x
+            5.0.x
+            6.0.x
       - name: Setup .NET
         uses: actions/setup-dotnet@v2
       - name: Run tests

Directory.Build.props

@@ -22,7 +22,7 @@
     <DefineConstants Condition="'$(TargetFramework)' == 'net5.0'">$(DefineConstants);FEATURE_FILE_SYSTEM_WATCHER_FILTERS</DefineConstants>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="System.IO.Abstractions" Version="13.*" />
+    <PackageReference Include="TestableIO.System.IO.Abstractions" Version="17.*" />
     <PackageReference Include="Nerdbank.GitVersioning" Version="3.4.255">
       <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
       <PrivateAssets>all</PrivateAssets>

global.json

@@ -1,6 +1,6 @@
 {
   "sdk": {
-    "version": "5.0.100",
-    "rollForward": "latestFeature"
+    "version": "6.0.403",
+    "rollForward": "latestMinor"
   }
 }

src/System.IO.Abstractions.Extensions/IDirectoryInfoExtensions.cs

@@ -10,7 +10,7 @@ public static class IDirectoryInfoExtensions
         /// <returns>An <see cref="IDirectoryInfo"/> for the specified sub-directory</returns>
         public static IDirectoryInfo SubDirectory(this IDirectoryInfo info, string name)
         {
-            return info.FileSystem.DirectoryInfo.FromDirectoryName(info.FileSystem.Path.Combine(info.FullName, name));
+            return info.FileSystem.DirectoryInfo.New(info.FileSystem.Path.Combine(info.FullName, name));
         }
 
         /// <summary>
@@ -21,7 +21,7 @@ public static IDirectoryInfo SubDirectory(this IDirectoryInfo info, string name)
         /// <returns>An <see cref="IFileInfo"/> for the specified file</returns>
         public static IFileInfo File(this IDirectoryInfo info, string name)
         {
-            return info.FileSystem.FileInfo.FromFileName(info.FileSystem.Path.Combine(info.FullName, name));
+            return info.FileSystem.FileInfo.New(info.FileSystem.Path.Combine(info.FullName, name));
         }
     }
 }

src/System.IO.Abstractions.Extensions/IFileSystemExtensions.cs

@@ -9,7 +9,7 @@ public static class IFileSystemExtensions
         /// <returns>An <see cref="IDirectoryInfo"/> for the current directory</returns>
         public static IDirectoryInfo CurrentDirectory(this IFileSystem fileSystem)
         {
-            return fileSystem.DirectoryInfo.FromDirectoryName(fileSystem.Directory.GetCurrentDirectory());
+            return fileSystem.DirectoryInfo.New(fileSystem.Directory.GetCurrentDirectory());
         }
     }
 }

src/System.IO.Abstractions.Extensions/System.IO.Abstractions.Extensions.csproj

@@ -1,9 +1,9 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
-  <PropertyGroup>
-    <PackageId>TestableIO.System.IO.Abstractions.Extensions</PackageId>
-    <TargetFrameworks>net5.0;netstandard2.1;netstandard2.0;net461</TargetFrameworks>
-    <Description>Convenience functionalities on top of System.IO.Abstractions</Description>
-  </PropertyGroup>
+	<PropertyGroup>
+		<PackageId>TestableIO.System.IO.Abstractions.Extensions</PackageId>
+		<TargetFrameworks>net6.0;net5.0;netstandard2.1;netstandard2.0;net461</TargetFrameworks>
+		<Description>Convenience functionalities on top of System.IO.Abstractions</Description>
+	</PropertyGroup>
 
 </Project>

tests/System.IO.Abstractions.Extensions.Tests/DirectoryInfoExtensionsTests.cs

@@ -10,7 +10,7 @@ public void SubDirectory_Extension_Test()
         {
             //arrange
             var fs = new FileSystem();
-            var current =  fs.DirectoryInfo.FromDirectoryName(fs.Directory.GetCurrentDirectory());
+            var current =  fs.DirectoryInfo.New(fs.Directory.GetCurrentDirectory());
             var guid = Guid.NewGuid().ToString();
             var expectedPath = fs.Path.Combine(current.FullName, guid);
 
@@ -35,7 +35,7 @@ public void File_Extension_Test()
         {
             //arrange
             var fs = new FileSystem();
-            var current = fs.DirectoryInfo.FromDirectoryName(fs.Directory.GetCurrentDirectory());
+            var current = fs.DirectoryInfo.New(fs.Directory.GetCurrentDirectory());
             var guid = Guid.NewGuid().ToString();
             var expectedPath = fs.Path.Combine(current.FullName, guid);
 

tests/System.IO.Abstractions.Extensions.Tests/System.IO.Abstractions.Extensions.Tests.csproj

@@ -1,14 +1,15 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
-  <PropertyGroup>
-    <TargetFrameworks>net5.0;netcoreapp3.1;netcoreapp2.1</TargetFrameworks>
-    <TargetFrameworks Condition="!$([MSBuild]::IsOsUnixLike())">$(TargetFrameworks);net461</TargetFrameworks>
-    <IsPackable>false</IsPackable>
-    <IsTestable>true</IsTestable>
-  </PropertyGroup>
+	<PropertyGroup>
+		<TargetFrameworks>net6.0;net5.0;netcoreapp3.1</TargetFrameworks>
+		<TargetFrameworks Condition="!$([MSBuild]::IsOsUnixLike())">$(TargetFrameworks);net461</TargetFrameworks>
+		<IsPackable>false</IsPackable>
+		<IsTestable>true</IsTestable>
+	</PropertyGroup>
 
-  <ItemGroup>
-    <ProjectReference Include="..\..\src\System.IO.Abstractions.Extensions\System.IO.Abstractions.Extensions.csproj" />
-  </ItemGroup>
+	<ItemGroup>
+		<PackageReference Include="TestableIO.System.IO.Abstractions.Wrappers" Version="17.*" />
+		<ProjectReference Include="..\..\src\System.IO.Abstractions.Extensions\System.IO.Abstractions.Extensions.csproj" />
+	</ItemGroup>
 
 </Project>