feat: Add LinkTarget to FileSystemInfo for .NET 6 targets (#790)

BrianMcBrayer · web-flow · commit ba59ebec9641 · 2022-01-11T22:23:08.000+01:00
Resolves #789
diff --git a/Directory.Build.props b/Directory.Build.props
@@ -13,6 +13,7 @@
     <DefineConstants Condition="'$(TargetFramework)' != 'net461'">$(DefineConstants);FEATURE_FILE_SYSTEM_ACL_EXTENSIONS</DefineConstants>
     <DefineConstants Condition="'$(TargetFramework)' == 'net6.0' OR '$(TargetFramework)' == 'net5.0' OR '$(TargetFramework)' == 'netcoreapp3.1' OR '$(TargetFramework)' == 'netstandard2.1'">$(DefineConstants);FEATURE_ASYNC_FILE;FEATURE_ENUMERATION_OPTIONS;FEATURE_ADVANCED_PATH_OPERATIONS;FEATURE_PATH_JOIN_WITH_SPAN</DefineConstants>
     <DefineConstants Condition="'$(TargetFramework)' == 'net6.0' OR '$(TargetFramework)' == 'net5.0'">$(DefineConstants);FEATURE_FILE_MOVE_WITH_OVERWRITE;FEATURE_SUPPORTED_OS_ATTRIBUTE;FEATURE_FILE_SYSTEM_WATCHER_FILTERS;FEATURE_ENDS_IN_DIRECTORY_SEPARATOR;FEATURE_PATH_JOIN_WITH_PARAMS;FEATURE_PATH_JOIN_WITH_FOUR_PATHS</DefineConstants>
+    <DefineConstants Condition="'$(TargetFramework)' == 'net6.0'">$(DefineConstants);FEATURE_FILE_SYSTEM_INFO_LINK_TARGET</DefineConstants>
   </PropertyGroup>
   <ItemGroup>
     <PackageReference Include="Nerdbank.GitVersioning" Version="3.4.255">
diff --git a/src/System.IO.Abstractions.TestingHelpers/MockDirectoryInfo.cs b/src/System.IO.Abstractions.TestingHelpers/MockDirectoryInfo.cs
@@ -134,6 +134,14 @@ public override DateTime LastWriteTimeUtc
             set { GetMockFileDataForWrite().LastWriteTime = value.ToLocalTime(); }
         }
 
+#if FEATURE_FILE_SYSTEM_INFO_LINK_TARGET
+        /// <inheritdoc />
+        public override string LinkTarget
+        {
+            get { return GetMockFileDataForRead().LinkTarget; }
+        }
+#endif
+
         /// <inheritdoc />
         public override string Name
         {
diff --git a/src/System.IO.Abstractions.TestingHelpers/MockFileData.cs b/src/System.IO.Abstractions.TestingHelpers/MockFileData.cs
@@ -101,6 +101,9 @@ public MockFileData(MockFileData template)
             CreationTime = template.CreationTime;
             LastAccessTime = template.LastAccessTime;
             LastWriteTime = template.LastWriteTime;
+#if FEATURE_FILE_SYSTEM_INFO_LINK_TARGET
+            LinkTarget = template.LinkTarget;
+#endif
         }
 
         /// <summary>
@@ -135,6 +138,13 @@ public string TextContents
         /// </summary>
         public DateTimeOffset LastWriteTime { get; set; } = new DateTimeOffset(2010, 01, 04, 00, 00, 00, TimeSpan.FromHours(4));
 
+#if FEATURE_FILE_SYSTEM_INFO_LINK_TARGET
+        /// <summary>
+        /// Gets or sets the link target of the <see cref="MockFileData"/>.
+        /// </summary>
+        public string LinkTarget { get; set; }
+#endif
+
         /// <summary>
         /// Casts a string into <see cref="MockFileData"/>.
         /// </summary>
diff --git a/src/System.IO.Abstractions.TestingHelpers/MockFileInfo.cs b/src/System.IO.Abstractions.TestingHelpers/MockFileInfo.cs
@@ -167,6 +167,18 @@ public override DateTime LastWriteTimeUtc
             }
         }
 
+#if FEATURE_FILE_SYSTEM_INFO_LINK_TARGET
+        /// <inheritdoc />
+        public override string LinkTarget
+        {
+            get
+            {
+                var mockFileData = GetMockFileDataForRead();
+                return mockFileData.LinkTarget;
+            }
+        }
+#endif
+
         /// <inheritdoc />
         public override string Name
         {
diff --git a/src/System.IO.Abstractions.TestingHelpers/System.IO.Abstractions.TestingHelpers.csproj b/src/System.IO.Abstractions.TestingHelpers/System.IO.Abstractions.TestingHelpers.csproj
@@ -3,7 +3,7 @@
         <AssemblyName>System.IO.Abstractions.TestingHelpers</AssemblyName>
         <RootNamespace>System.IO.Abstractions.TestingHelpers</RootNamespace>
         <Description>A set of pre-built mocks to help when testing file system interactions.</Description>
-        <TargetFrameworks>net5.0;netstandard2.1;netstandard2.0;net461</TargetFrameworks>
+        <TargetFrameworks>net6.0;net5.0;netstandard2.1;netstandard2.0;net461</TargetFrameworks>
         <PackageIcon>icon_256x256.png</PackageIcon>
     </PropertyGroup>
     <ItemGroup>
@@ -16,6 +16,6 @@
         </PackageReference>
     </ItemGroup>
     <ItemGroup>
-        <None Include="..\..\images\icon_256x256.png" Pack="true" PackagePath="\"/>
+        <None Include="..\..\images\icon_256x256.png" Pack="true" PackagePath="\" />
     </ItemGroup>
 </Project>
diff --git a/src/System.IO.Abstractions/DirectoryInfoWrapper.cs b/src/System.IO.Abstractions/DirectoryInfoWrapper.cs
@@ -96,6 +96,14 @@ public override DateTime LastWriteTimeUtc
             set { instance.LastWriteTimeUtc = value; }
         }
 
+#if FEATURE_FILE_SYSTEM_INFO_LINK_TARGET
+        /// <inheritdoc />
+        public override string LinkTarget
+        {
+            get { return instance.LinkTarget; }
+        }
+#endif
+
         /// <inheritdoc />
         public override string Name
         {
diff --git a/src/System.IO.Abstractions/FileInfoWrapper.cs b/src/System.IO.Abstractions/FileInfoWrapper.cs
@@ -94,6 +94,14 @@ public override DateTime LastWriteTimeUtc
             set { instance.LastWriteTimeUtc = value; }
         }
 
+#if FEATURE_FILE_SYSTEM_INFO_LINK_TARGET
+        /// <inheritdoc />
+        public override string LinkTarget
+        {
+            get { return instance.LinkTarget; }
+        }
+#endif
+
         /// <inheritdoc />
         public override string Name
         {
diff --git a/src/System.IO.Abstractions/FileSystemInfoBase.cs b/src/System.IO.Abstractions/FileSystemInfoBase.cs
@@ -54,6 +54,11 @@ internal FileSystemInfoBase() { }
         /// <inheritdoc cref="FileSystemInfo.LastWriteTimeUtc"/>
         public abstract DateTime LastWriteTimeUtc { get; set; }
 
+#if FEATURE_FILE_SYSTEM_INFO_LINK_TARGET
+        /// <inheritdoc cref="FileSystemInfo.LinkTarget"/>
+        public abstract string LinkTarget { get; }
+#endif
+
         /// <inheritdoc cref="FileSystemInfo.Name"/>
         public abstract string Name { get; }
     }
diff --git a/src/System.IO.Abstractions/System.IO.Abstractions.csproj b/src/System.IO.Abstractions/System.IO.Abstractions.csproj
@@ -3,14 +3,14 @@
     <AssemblyName>System.IO.Abstractions</AssemblyName>
     <RootNamespace>System.IO.Abstractions</RootNamespace>
     <Description>A set of abstractions to help make file system interactions testable.</Description>
-    <TargetFrameworks>net5.0;netstandard2.1;netstandard2.0;net461</TargetFrameworks>
+    <TargetFrameworks>net6.0;net5.0;netstandard2.1;netstandard2.0;net461</TargetFrameworks>
     <PackageIcon>icon_256x256.png</PackageIcon>
   </PropertyGroup>
   <ItemGroup Condition="'$(TargetFramework)' == 'netstandard2.1' OR '$(TargetFramework)' == 'netstandard2.0'">
-    <PackageReference Include="System.IO.FileSystem.AccessControl" Version="4.7.0"/>
+    <PackageReference Include="System.IO.FileSystem.AccessControl" Version="4.7.0" />
   </ItemGroup>
   <ItemGroup Condition="'$(TargetFramework)' == 'net5.0'">
-    <PackageReference Include="System.IO.FileSystem.AccessControl" Version="5.0.0"/>
+    <PackageReference Include="System.IO.FileSystem.AccessControl" Version="5.0.0" />
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="Microsoft.NETFramework.ReferenceAssemblies.net461" Version="1.0.2">
diff --git a/tests/System.IO.Abstractions.TestingHelpers.Tests/MockDirectoryArgumentPathTests.cs b/tests/System.IO.Abstractions.TestingHelpers.Tests/MockDirectoryArgumentPathTests.cs
@@ -28,7 +28,7 @@ private static IEnumerable<Action<IDirectory>> GetFileSystemActionsForArgumentNu
             yield return ds => ds.EnumerateDirectories(null, "foo", SearchOption.AllDirectories);
         }
 
-        [TestCaseSource("GetFileSystemActionsForArgumentNullException")]
+        [TestCaseSource(nameof(GetFileSystemActionsForArgumentNullException))]
         public void Operations_ShouldThrowArgumentNullExceptionIfPathIsNull(Action<IDirectory> action)
         {
             // Arrange
diff --git a/tests/System.IO.Abstractions.Tests/__snapshots__/ApiParityTests.DirectoryInfo_.NET 6.0.snap b/tests/System.IO.Abstractions.Tests/__snapshots__/ApiParityTests.DirectoryInfo_.NET 6.0.snap
@@ -9,8 +9,6 @@
     "System.IO.Abstractions.IFileSystemInfo ResolveLinkTarget(Boolean)",
     "System.Object GetLifetimeService()",
     "System.Object InitializeLifetimeService()",
-    "System.String LinkTarget",
-    "System.String get_LinkTarget()",
     "Void .ctor(System.String)",
     "Void CreateAsSymbolicLink(System.String)",
     "Void GetObjectData(System.Runtime.Serialization.SerializationInfo, System.Runtime.Serialization.StreamingContext)"
diff --git a/tests/System.IO.Abstractions.Tests/__snapshots__/ApiParityTests.FileInfo_.NET 6.0.snap b/tests/System.IO.Abstractions.Tests/__snapshots__/ApiParityTests.FileInfo_.NET 6.0.snap
@@ -9,8 +9,6 @@
     "System.IO.Abstractions.IFileSystemInfo ResolveLinkTarget(Boolean)",
     "System.Object GetLifetimeService()",
     "System.Object InitializeLifetimeService()",
-    "System.String LinkTarget",
-    "System.String get_LinkTarget()",
     "Void .ctor(System.String)",
     "Void CreateAsSymbolicLink(System.String)",
     "Void GetObjectData(System.Runtime.Serialization.SerializationInfo, System.Runtime.Serialization.StreamingContext)"
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": "16.0",
+  "version": "16.1",
   "assemblyVersion": {
     "precision": "major"
   },
@@ -12,4 +12,4 @@
       "enabled": true
     }
   }
-}
+}

Original file line number	Diff line number	Diff line change
`@@ -134,6 +134,14 @@ public override DateTime LastWriteTimeUtc`
`134`	`134`	`set { GetMockFileDataForWrite().LastWriteTime = value.ToLocalTime(); }`
`135`	`135`	`}`
`136`	`136`
	`137`	`+#if FEATURE_FILE_SYSTEM_INFO_LINK_TARGET`
	`138`	`+ /// <inheritdoc />`
	`139`	`+ public override string LinkTarget`
	`140`	`+ {`
	`141`	`+ get { return GetMockFileDataForRead().LinkTarget; }`
	`142`	`+ }`
	`143`	`+#endif`
	`144`	`+`
`137`	`145`	`/// <inheritdoc />`
`138`	`146`	`public override string Name`
`139`	`147`	`{`
Original file line number	Diff line number	Diff line change
`@@ -167,6 +167,18 @@ public override DateTime LastWriteTimeUtc`
`167`	`167`	`}`
`168`	`168`	`}`
`169`	`169`
	`170`	`+#if FEATURE_FILE_SYSTEM_INFO_LINK_TARGET`
	`171`	`+ /// <inheritdoc />`
	`172`	`+ public override string LinkTarget`
	`173`	`+ {`
	`174`	`+ get`
	`175`	`+ {`
	`176`	`+ var mockFileData = GetMockFileDataForRead();`
	`177`	`+ return mockFileData.LinkTarget;`
	`178`	`+ }`
	`179`	`+ }`
	`180`	`+#endif`
	`181`	`+`
`170`	`182`	`/// <inheritdoc />`
`171`	`183`	`public override string Name`
`172`	`184`	`{`
Original file line number	Diff line number	Diff line change
`@@ -96,6 +96,14 @@ public override DateTime LastWriteTimeUtc`
`96`	`96`	`set { instance.LastWriteTimeUtc = value; }`
`97`	`97`	`}`
`98`	`98`
	`99`	`+#if FEATURE_FILE_SYSTEM_INFO_LINK_TARGET`
	`100`	`+ /// <inheritdoc />`
	`101`	`+ public override string LinkTarget`
	`102`	`+ {`
	`103`	`+ get { return instance.LinkTarget; }`
	`104`	`+ }`
	`105`	`+#endif`
	`106`	`+`
`99`	`107`	`/// <inheritdoc />`
`100`	`108`	`public override string Name`
`101`	`109`	`{`
Original file line number	Diff line number	Diff line change
`@@ -94,6 +94,14 @@ public override DateTime LastWriteTimeUtc`
`94`	`94`	`set { instance.LastWriteTimeUtc = value; }`
`95`	`95`	`}`
`96`	`96`
	`97`	`+#if FEATURE_FILE_SYSTEM_INFO_LINK_TARGET`
	`98`	`+ /// <inheritdoc />`
	`99`	`+ public override string LinkTarget`
	`100`	`+ {`
	`101`	`+ get { return instance.LinkTarget; }`
	`102`	`+ }`
	`103`	`+#endif`
	`104`	`+`
`97`	`105`	`/// <inheritdoc />`
`98`	`106`	`public override string Name`
`99`	`107`	`{`
Original file line number	Diff line number	Diff line change
`@@ -28,7 +28,7 @@ private static IEnumerable<Action<IDirectory>> GetFileSystemActionsForArgumentNu`
`28`	`28`	`yield return ds => ds.EnumerateDirectories(null, "foo", SearchOption.AllDirectories);`
`29`	`29`	`}`
`30`	`30`
`31`		`- [TestCaseSource("GetFileSystemActionsForArgumentNullException")]`
	`31`	`+ [TestCaseSource(nameof(GetFileSystemActionsForArgumentNullException))]`
`32`	`32`	`public void Operations_ShouldThrowArgumentNullExceptionIfPathIsNull(Action<IDirectory> action)`
`33`	`33`	`{`
`34`	`34`	`// Arrange`