Skip to content

Commit 865a99b

Browse files
spanglercofgreinacher
authored andcommitted
Enable File.Replace for all but netstandard1.4
According to the documentation, File.Replace is a part of .NET Standard 2.0 and supported by Core 2.0 and later. Related to #334 but does not attempt to address all methods that might be supported by .NET Standard/Core 2.0 and later.
1 parent 0969b43 commit 865a99b

6 files changed

Lines changed: 8 additions & 8 deletions

File tree

System.IO.Abstractions.TestingHelpers.Tests/MockFileTests.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -610,7 +610,6 @@ public void MockFile_Decrypt_ShouldRemoveEncryptedAttribute()
610610
}
611611
#endif
612612

613-
#if NET40
614613
[Test]
615614
public void MockFile_Replace_ShouldReplaceFileContents()
616615
{
@@ -683,6 +682,7 @@ public void MockFile_Replace_ShouldThrowIfDestinationFileDoesNotExist()
683682
Assert.Throws<FileNotFoundException>(() => fileSystem.File.Replace(path1, path2, null));
684683
}
685684

685+
#if NET40
686686
[Test]
687687
public void MockFile_OpenRead_ShouldReturnReadOnlyStream()
688688
{

System.IO.Abstractions.TestingHelpers/MockFile.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -597,7 +597,7 @@ public override IEnumerable<string> ReadLines(string path, Encoding encoding)
597597
return ReadAllLines(path, encoding);
598598
}
599599

600-
#if NET40
600+
#if !NETSTANDARD1_4
601601
public override void Replace(string sourceFileName, string destinationFileName, string destinationBackupFileName)
602602
{
603603
Replace(sourceFileName, destinationFileName, destinationBackupFileName, false);

System.IO.Abstractions/FileBase.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -347,7 +347,7 @@ internal FileBase() { }
347347
/// <inheritdoc cref="File.ReadLines(string,Encoding)"/>
348348
public abstract IEnumerable<string> ReadLines(string path, Encoding encoding);
349349

350-
#if NET40
350+
#if !NETSTANDARD1_4
351351
/// <inheritdoc cref="File.Replace(string,string,string)"/>
352352
public abstract void Replace(string sourceFileName, string destinationFileName, string destinationBackupFileName);
353353

@@ -657,11 +657,11 @@ internal FileBase() { }
657657
/// The file handle is guaranteed to be closed by this method, even if exceptions are raised.
658658
/// </remarks>
659659
public abstract void WriteAllText(string path, string contents, Encoding encoding);
660-
660+
661661
#if NETCOREAPP2_0 || NETSTANDARD2_1
662662
/// <inheritdoc cref="File.WriteAllTextAsync(string,string,CancellationToken)"/>
663663
public abstract Task WriteAllTextAsync(string path, string contents, CancellationToken cancellationToken);
664-
664+
665665
/// <inheritdoc cref="File.WriteAllTextAsync(string,string,Encoding,CancellationToken)"/>
666666
public abstract Task WriteAllTextAsync(string path, string contents, Encoding encoding, CancellationToken cancellationToken);
667667
#endif

System.IO.Abstractions/FileWrapper.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -285,7 +285,7 @@ public override IEnumerable<string> ReadLines(string path, Encoding encoding)
285285
return File.ReadLines(path, encoding);
286286
}
287287

288-
#if NET40
288+
#if !NETSTANDARD1_4
289289
public override void Replace(string sourceFileName, string destinationFileName, string destinationBackupFileName)
290290
{
291291
File.Replace(sourceFileName, destinationFileName, destinationBackupFileName);

System.IO.Abstractions/IFile.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -128,7 +128,7 @@ public interface IFile
128128
IEnumerable<string> ReadLines(string path);
129129
/// <inheritdoc cref="File.ReadLines(string,Encoding)"/>
130130
IEnumerable<string> ReadLines(string path, Encoding encoding);
131-
#if NET40
131+
#if !NETSTANDARD1_4
132132
/// <inheritdoc cref="File.Replace(string,string,string)"/>
133133
void Replace(string sourceFileName, string destinationFileName, string destinationBackupFileName);
134134
/// <inheritdoc cref="File.Replace(string,string,string,bool)"/>

version.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"$schema": "https://raw.githubusercontent.com/AArnott/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json",
3-
"version": "7.0",
3+
"version": "7.1",
44
"assemblyVersion": {
55
"precision": "major"
66
},

0 commit comments

Comments
 (0)