Skip to content

Commit c8cc15a

Browse files
davidegiacomettidavidegiacometti
committed
System.IO.Abstractions update
1 parent af5b990 commit c8cc15a

File tree

18 files changed

+28
-23
lines changed

18 files changed

+28
-23
lines changed

Diff for: ‎src/modules/Hosts/Hosts.Tests/Hosts.Tests.csproj

+2-2
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,8 @@
1919
<PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
2020
<PackageReference Include="MSTest.TestAdapter" Version="2.2.3" />
2121
<PackageReference Include="MSTest.TestFramework" Version="2.2.3" />
22-
<PackageReference Include="System.IO.Abstractions" Version="12.2.5" />
23-
<PackageReference Include="System.IO.Abstractions.TestingHelpers" Version="12.2.3" />
22+
<PackageReference Include="System.IO.Abstractions" Version="17.2.3" />
23+
<PackageReference Include="System.IO.Abstractions.TestingHelpers" Version="17.2.3" />
2424
</ItemGroup>
2525

2626
<ItemGroup>

Diff for: ‎src/modules/Hosts/Hosts/Hosts.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333
<PackageReference Include="Microsoft.WindowsAppSDK" Version="1.1.5" />
3434
<PackageReference Include="Microsoft.Windows.SDK.BuildTools" Version="10.0.22621.1" />
3535
<PackageReference Include="Microsoft.Xaml.Behaviors.WinUI.Managed" Version="2.0.9" />
36-
<PackageReference Include="System.IO.Abstractions" Version="12.2.5" />
36+
<PackageReference Include="System.IO.Abstractions" Version="17.2.3" />
3737
<PackageReference Include="WinUIEx" Version="1.8.0" />
3838
<Manifest Include="$(ApplicationManifest)" />
3939
</ItemGroup>

Diff for: ‎src/modules/colorPicker/ColorPickerUI/ColorPickerUI.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@
4343
<PackageReference Include="ModernWpfUI" Version="0.9.6" />
4444
<PackageReference Include="System.ComponentModel.Composition" Version="6.0.0" />
4545
<PackageReference Include="System.Data.DataSetExtensions" Version="4.5.0" />
46-
<PackageReference Include="System.IO.Abstractions" Version="12.2.5" />
46+
<PackageReference Include="System.IO.Abstractions" Version="17.2.3" />
4747
<PackageReference Include="Microsoft.Xaml.Behaviors.Wpf" Version="1.1.39" />
4848
<PackageReference Include="System.Drawing.Common" Version="6.0.0" />
4949
</ItemGroup>

Diff for: ‎src/modules/fancyzones/editor/FancyZonesEditor/FancyZonesEditor.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@
4848

4949
<ItemGroup>
5050
<PackageReference Include="ModernWpfUI" Version="0.9.6" />
51-
<PackageReference Include="System.IO.Abstractions" Version="12.2.5" />
51+
<PackageReference Include="System.IO.Abstractions" Version="17.2.3" />
5252
<PackageReference Include="System.Text.Json" Version="6.0.2" />
5353
</ItemGroup>
5454
<ItemGroup>

Diff for: ‎src/modules/imageresizer/tests/ImageResizerUITest.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@
5454
<PackageReference Include="Moq" Version="4.16.1" />
5555
<PackageReference Include="MSTest.TestAdapter" Version="2.2.3" />
5656
<PackageReference Include="MSTest.TestFramework" Version="2.2.3" />
57-
<PackageReference Include="System.IO.Abstractions" Version="12.2.5" />
57+
<PackageReference Include="System.IO.Abstractions" Version="17.2.3" />
5858
<PackageReference Include="System.ValueTuple" Version="4.5.0" />
5959
</ItemGroup>
6060
</Project>

Diff for: ‎src/modules/imageresizer/ui/ImageResizerUI.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@
4848
<PackageReference Include="Microsoft.Xaml.Behaviors.Wpf" Version="1.1.39" />
4949
<PackageReference Include="ModernWpfUI" Version="0.9.6" />
5050
<PackageReference Include="System.IO.Abstractions">
51-
<Version>12.2.5</Version>
51+
<Version>17.2.3</Version>
5252
</PackageReference>
5353
<PackageReference Include="System.Text.Json" Version="6.0.2" />
5454
</ItemGroup>

Diff for: ‎src/modules/launcher/Plugins/Microsoft.Plugin.Folder.UnitTests/InternalQueryFolderTests.cs

+2-1
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44

55
using System;
66
using System.Collections.Generic;
7+
using System.IO;
78
using System.IO.Abstractions.TestingHelpers;
89
using System.Linq;
910
using Microsoft.Plugin.Folder.Sources;
@@ -31,7 +32,7 @@ public void SetupMock()
3132
{ @"c:\Test\b\", new MockDirectoryData() },
3233
});
3334

34-
_queryFileSystemInfoMock = new QueryFileSystemInfo(_fileSystem.DirectoryInfo);
35+
_queryFileSystemInfoMock = new QueryFileSystemInfo(_fileSystem.DirectoryInfo, MatchType.Simple, FileAttributes.Hidden | FileAttributes.System);
3536
}
3637

3738
[TestMethod]

Diff for: ‎src/modules/launcher/Plugins/Microsoft.Plugin.Folder.UnitTests/Microsoft.Plugin.Folder.UnitTests.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
<PackageReference Include="MSTest.TestFramework" Version="2.2.3" />
1414
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.2.0" />
1515
<PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
16-
<PackageReference Include="System.IO.Abstractions.TestingHelpers" Version="12.2.3" />
16+
<PackageReference Include="System.IO.Abstractions.TestingHelpers" Version="17.2.3" />
1717
</ItemGroup>
1818

1919
<ItemGroup>

Diff for: ‎src/modules/launcher/Plugins/Microsoft.Plugin.Folder/Microsoft.Plugin.Folder.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@
5454

5555
<ItemGroup>
5656
<PackageReference Include="JetBrains.Annotations" Version="2021.3.0" />
57-
<PackageReference Include="System.IO.Abstractions" Version="12.2.5" />
57+
<PackageReference Include="System.IO.Abstractions" Version="17.2.3" />
5858
<PackageReference Include="System.Runtime" Version="4.3.1" />
5959
</ItemGroup>
6060

Diff for: ‎src/modules/launcher/Plugins/Microsoft.Plugin.Folder/Sources/QueryFileSystemInfo.cs

+9-5
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// Copyright (c) Microsoft Corporation
1+
// Copyright (c) Microsoft Corporation
22
// The Microsoft Corporation licenses this file to you under the MIT license.
33
// See the LICENSE file in the project root for more information.
44

@@ -12,23 +12,27 @@ namespace Microsoft.Plugin.Folder.Sources
1212
public class QueryFileSystemInfo : IQueryFileSystemInfo
1313
{
1414
private readonly IDirectoryInfoFactory _directoryInfoFactory;
15+
private readonly MatchType _matchType;
16+
private readonly FileAttributes _attributesToSkip;
1517

16-
public QueryFileSystemInfo(IDirectoryInfoFactory directoryInfoFactory)
18+
public QueryFileSystemInfo(IDirectoryInfoFactory directoryInfoFactory, MatchType matchType = MatchType.Win32, FileAttributes attributesToSkip = FileAttributes.Hidden)
1719
{
1820
_directoryInfoFactory = directoryInfoFactory;
21+
_matchType = matchType;
22+
_attributesToSkip = attributesToSkip;
1923
}
2024

2125
public IEnumerable<DisplayFileInfo> MatchFileSystemInfo(string search, string incompleteName, bool isRecursive)
2226
{
2327
// search folder and add results
2428
var directoryInfo = _directoryInfoFactory.FromDirectoryName(search);
25-
var fileSystemInfos = directoryInfo.EnumerateFileSystemInfos(incompleteName, new EnumerationOptions()
29+
var fileSystemInfos = directoryInfo.EnumerateFileSystemInfos(incompleteName, new EnumerationOptions
2630
{
27-
MatchType = MatchType.Win32,
31+
MatchType = _matchType,
2832
RecurseSubdirectories = isRecursive,
2933
IgnoreInaccessible = true,
3034
ReturnSpecialDirectories = false,
31-
AttributesToSkip = FileAttributes.Hidden,
35+
AttributesToSkip = _attributesToSkip,
3236
MatchCasing = MatchCasing.PlatformDefault,
3337
});
3438

Diff for: ‎src/modules/launcher/Wox.Infrastructure/Wox.Infrastructure.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@
4444
<PackageReference Include="JetBrains.Annotations" Version="2021.3.0" />
4545
<PackageReference Include="NLog.Schema" Version="5.0.4" />
4646
<PackageReference Include="System.Drawing.Common" Version="6.0.0" />
47-
<PackageReference Include="System.IO.Abstractions" Version="12.2.5" />
47+
<PackageReference Include="System.IO.Abstractions" Version="17.2.3" />
4848
<PackageReference Include="System.Runtime" Version="4.3.1" />
4949
</ItemGroup>
5050
</Project>

Diff for: ‎src/modules/previewpane/GcodePreviewHandler/GcodePreviewHandler.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232
</ItemGroup>
3333

3434
<ItemGroup>
35-
<PackageReference Include="System.IO.Abstractions" Version="12.2.5" />
35+
<PackageReference Include="System.IO.Abstractions" Version="17.2.3" />
3636
<PackageReference Include="System.Runtime.WindowsRuntime" Version="4.7.0" />
3737
</ItemGroup>
3838

Diff for: ‎src/modules/previewpane/MarkdownPreviewHandler/MarkdownPreviewHandler.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@
4141
<PackageReference Include="HtmlAgilityPack" Version="1.11.42" />
4242
<PackageReference Include="Markdig.Signed" Version="0.27.0" />
4343
<PackageReference Include="Microsoft.Web.WebView2" Version="1.0.1343.22" />
44-
<PackageReference Include="System.IO.Abstractions" Version="12.2.5" />
44+
<PackageReference Include="System.IO.Abstractions" Version="17.2.3" />
4545
</ItemGroup>
4646

4747
<ItemGroup>

Diff for: ‎src/modules/previewpane/MonacoPreviewHandler/MonacoPreviewHandler.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828

2929
<ItemGroup>
3030
<PackageReference Include="Microsoft.Web.WebView2" Version="1.0.1343.22" />
31-
<PackageReference Include="System.IO.Abstractions" Version="12.2.5" />
31+
<PackageReference Include="System.IO.Abstractions" Version="17.2.3" />
3232
</ItemGroup>
3333

3434
<ItemGroup>

Diff for: ‎src/modules/previewpane/PdfPreviewHandler/PdfPreviewHandler.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232
</ItemGroup>
3333

3434
<ItemGroup>
35-
<PackageReference Include="System.IO.Abstractions" Version="12.2.5" />
35+
<PackageReference Include="System.IO.Abstractions" Version="17.2.3" />
3636
</ItemGroup>
3737

3838
<ItemGroup>

Diff for: ‎src/modules/previewpane/common/PreviewHandlerCommon.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,6 @@
2727

2828
<ItemGroup>
2929
<PackageReference Include="Microsoft.Web.WebView2" Version="1.0.1343.22" />
30-
<PackageReference Include="System.IO.Abstractions" Version="12.2.5" />
30+
<PackageReference Include="System.IO.Abstractions" Version="17.2.3" />
3131
</ItemGroup>
3232
</Project>

Diff for: ‎src/settings-ui/Settings.UI.Library/Settings.UI.Library.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
</ItemGroup>
2626

2727
<ItemGroup>
28-
<PackageReference Include="System.IO.Abstractions" Version="12.2.5" />
28+
<PackageReference Include="System.IO.Abstractions" Version="17.2.3" />
2929
<PackageReference Include="System.Text.Json" Version="6.0.2" />
3030
</ItemGroup>
3131

Diff for: ‎src/settings-ui/Settings.UI.UnitTests/Settings.UI.UnitTests.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
<PrivateAssets>all</PrivateAssets>
2929
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
3030
</PackageReference>
31-
<PackageReference Include="System.IO.Abstractions.TestingHelpers" Version="12.2.3" />
31+
<PackageReference Include="System.IO.Abstractions.TestingHelpers" Version="17.2.3" />
3232
</ItemGroup>
3333

3434
<ItemGroup>

0 commit comments

Comments
 (0)