Skip to content

Commit f299f92

Browse files
phmatrayphmatray
authored
Merge branch 'main' into dependabot/nuget/Microsoft.NET.Test.Sdk-17.12.0
2 parents 7ccfc61 + d86d1af commit f299f92

File tree

10 files changed

+40
-37
lines changed

10 files changed

+40
-37
lines changed

‎.github/workflows/dotnet.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,4 +33,4 @@ jobs:
3333
run: dotnet test --no-build --verbosity normal --collect:"XPlat Code Coverage"
3434

3535
- name: Upload Code Coverage
36-
uses: codecov/codecov-action@v4
36+
uses: codecov/codecov-action@v5

‎.run/Atypical.VirtualFileSystem.DemoCli.run.xml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
<component name="ProjectRunConfigurationManager">
22
<configuration default="false" name="Atypical.VirtualFileSystem.DemoCli" type="DotNetProject" factoryName=".NET Project">
3-
<option name="EXE_PATH" value="$PROJECT_DIR$/Atypical.VirtualFileSystem.DemoCli/bin/Debug/net9.0/Atypical.VirtualFileSystem.DemoCli" />
3+
<option name="EXE_PATH" value="$PROJECT_DIR$/src/Atypical.VirtualFileSystem.DemoCli/bin/Debug/net9.0/Atypical.VirtualFileSystem.DemoCli" />
44
<option name="PROGRAM_PARAMETERS" value="demo" />
5-
<option name="WORKING_DIRECTORY" value="$PROJECT_DIR$/Atypical.VirtualFileSystem.DemoCli/bin/Debug/net9.0" />
5+
<option name="WORKING_DIRECTORY" value="$PROJECT_DIR$/src/Atypical.VirtualFileSystem.DemoCli/bin/Debug/net9.0" />
66
<option name="PASS_PARENT_ENVS" value="1" />
77
<option name="USE_EXTERNAL_CONSOLE" value="0" />
88
<option name="USE_MONO" value="0" />
99
<option name="RUNTIME_ARGUMENTS" value="" />
10-
<option name="PROJECT_PATH" value="$PROJECT_DIR$/Atypical.VirtualFileSystem.DemoCli/Atypical.VirtualFileSystem.DemoCli.csproj" />
10+
<option name="PROJECT_PATH" value="$PROJECT_DIR$/src/Atypical.VirtualFileSystem.DemoCli/Atypical.VirtualFileSystem.DemoCli.csproj" />
1111
<option name="PROJECT_EXE_PATH_TRACKING" value="1" />
1212
<option name="PROJECT_ARGUMENTS_TRACKING" value="1" />
1313
<option name="PROJECT_WORKING_DIRECTORY_TRACKING" value="1" />

‎Atypical.VirtualFileSystem.sln‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Atypical.VirtualFileSystem.
1313
EndProject
1414
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "demo", "demo", "{EB224BFD-23D3-41CE-AA5E-FE2D69D78B76}"
1515
EndProject
16-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Atypical.VirtualFileSystem.DemoCli", "Atypical.VirtualFileSystem.DemoCli\Atypical.VirtualFileSystem.DemoCli.csproj", "{40DD51CE-1F1B-466E-9177-05C9401FF81B}"
16+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Atypical.VirtualFileSystem.DemoCli", "src\Atypical.VirtualFileSystem.DemoCli\Atypical.VirtualFileSystem.DemoCli.csproj", "{40DD51CE-1F1B-466E-9177-05C9401FF81B}"
1717
EndProject
1818
Global
1919
GlobalSection(SolutionConfigurationPlatforms) = preSolution

Atypical.VirtualFileSystem.DemoCli/Atypical.VirtualFileSystem.DemoCli.csproj renamed to src/Atypical.VirtualFileSystem.DemoCli/Atypical.VirtualFileSystem.DemoCli.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
</ItemGroup>
1111

1212
<ItemGroup>
13-
<ProjectReference Include="..\src\Atypical.VirtualFileSystem.Core\Atypical.VirtualFileSystem.Core.csproj" />
13+
<ProjectReference Include="..\Atypical.VirtualFileSystem.Core\Atypical.VirtualFileSystem.Core.csproj" />
1414
</ItemGroup>
1515

1616
</Project>

‎src/Atypical.VirtualFileSystem.DemoCli/Commands/BugDeleteFolder.cs‎

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
1+
using Spectre.Console.Cli;
2+
3+
namespace Atypical.VirtualFileSystem.DemoCli.Commands;
4+
5+
public class BugDeleteFolder : Command
6+
{
7+
public override int Execute(CommandContext context)
8+
{
9+
// Create a virtual file system
10+
var factory = new VirtualFileSystemFactory();
11+
var vfs = factory.CreateFileSystem();
12+
13+
// Create folders
14+
vfs.CreateDirectory("/Assets");
15+
vfs.CreateDirectory("/Assets/New Folder");
16+
vfs.CreateDirectory("/Assets/New Folder 1");
17+
18+
// Delete folder
19+
vfs.DeleteDirectory("/Assets/New Folder 1");
20+
21+
var paths = vfs.Index.GetPathsStartingWith("/Assets/New Folder");
22+
23+
foreach (var path in paths)
24+
{
25+
AnsiConsole.MarkupLine($"[red]{path}[/]");
26+
}
27+
28+
return 0;
29+
}
30+
}

Atypical.VirtualFileSystem.DemoCli/Commands/DemonstrateVFS.cs renamed to src/Atypical.VirtualFileSystem.DemoCli/Commands/DemonstrateVFS.cs

Lines changed: 0 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -2,33 +2,6 @@
22

33
namespace Atypical.VirtualFileSystem.DemoCli.Commands;
44

5-
public class BugDeleteFolder : Command
6-
{
7-
public override int Execute(CommandContext context)
8-
{
9-
// Create a virtual file system
10-
var factory = new VirtualFileSystemFactory();
11-
var vfs = factory.CreateFileSystem();
12-
13-
// Create folders
14-
vfs.CreateDirectory("/Assets");
15-
vfs.CreateDirectory("/Assets/New Folder");
16-
vfs.CreateDirectory("/Assets/New Folder 1");
17-
18-
// Delete folder
19-
vfs.DeleteDirectory("/Assets/New Folder 1");
20-
21-
var paths = vfs.Index.GetPathsStartingWith("/Assets/New Folder");
22-
23-
foreach (var path in paths)
24-
{
25-
AnsiConsole.MarkupLine($"[red]{path}[/]");
26-
}
27-
28-
return 0;
29-
}
30-
}
31-
325
public class DemonstrateVFS : Command
336
{
347
public override int Execute(CommandContext context)

Atypical.VirtualFileSystem.DemoCli/Extensions/TreeExtensions.cs renamed to src/Atypical.VirtualFileSystem.DemoCli/Extensions/TreeExtensions.cs

File renamed without changes.

Atypical.VirtualFileSystem.DemoCli/GlobalUsings.cs renamed to src/Atypical.VirtualFileSystem.DemoCli/GlobalUsings.cs

File renamed without changes.

Atypical.VirtualFileSystem.DemoCli/Program.cs renamed to src/Atypical.VirtualFileSystem.DemoCli/Program.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55

66
app.Configure(config =>
77
{
8-
config.AddCommand<BugDeleteFolder>("demo");
8+
config.AddCommand<DemonstrateVFS>("demo");
99
});
1010

1111
app.Run(args);

‎tests/Atypical.VirtualFileSystem.UnitTests/Atypical.VirtualFileSystem.UnitTests.csproj‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,14 +6,14 @@
66
</PropertyGroup>
77

88
<ItemGroup>
9-
<PackageReference Include="FluentAssertions" Version="6.12.2" />
9+
<PackageReference Include="FluentAssertions" Version="7.0.0" />
1010
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.12.0" />
1111
<PackageReference Include="xunit" Version="2.9.2" />
12-
<PackageReference Include="xunit.runner.visualstudio" Version="2.8.2">
12+
<PackageReference Include="xunit.runner.visualstudio" Version="3.0.0">
1313
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
1414
<PrivateAssets>all</PrivateAssets>
1515
</PackageReference>
16-
<PackageReference Include="coverlet.collector" Version="6.0.2">
16+
<PackageReference Include="coverlet.collector" Version="6.0.3">
1717
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
1818
<PrivateAssets>all</PrivateAssets>
1919
</PackageReference>

0 commit comments

Comments
 (0)