Skip to content

Commit bd8a507

Browse files
tomc128tomc128
authored
Merge pull request #3 from tomc128/project-restructure
Project restructure
2 parents ebc53cd + d8aff7d commit bd8a507

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

64 files changed

+168
-167
lines changed

‎BooleanExpressionParser.CLI/BooleanExpressionParser.CLI.csproj‎

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
<Project Sdk="Microsoft.NET.Sdk">
2+
3+
<PropertyGroup>
4+
<OutputType>Exe</OutputType>
5+
<TargetFramework>net7.0</TargetFramework>
6+
<ImplicitUsings>enable</ImplicitUsings>
7+
<Nullable>enable</Nullable>
8+
</PropertyGroup>
9+
10+
<ItemGroup>
11+
<PackageReference Include="Spectre.Console" Version="0.45.0" />
12+
<PackageReference Include="System.CommandLine" Version="2.0.0-beta4.22272.1" />
13+
</ItemGroup>
14+
15+
<ItemGroup>
16+
<ProjectReference Include="..\BooleanExpressionParser\BooleanExpressionParser.csproj" />
17+
</ItemGroup>
18+
19+
</Project>

‎BooleanExpressionParser/Formatters/BasicFormatter.cs‎ renamed to ‎BooleanExpressionParser.CLI/Formatters/BasicFormatter.cs‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
using System.Text;
2+
using BooleanExpressionParser;
3+
using BooleanExpressionParser.Tokens;
24

3-
namespace BooleanExpressionParser.Formatter;
4-
5+
namespace BooleanExpressionParser.CLI.Formatters;
56

67
public class BasicFormatter : IFormatter
78
{

‎BooleanExpressionParser/Formatters/DisplayFormatter.cs‎ renamed to ‎BooleanExpressionParser.CLI/Formatters/DisplayFormatter.cs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
11
using System.Globalization;
22
using System.Text;
3+
using BooleanExpressionParser.Tokens;
34
using Spectre.Console;
45

5-
namespace BooleanExpressionParser.Formatter;
6+
namespace BooleanExpressionParser.CLI.Formatters;
67

78
public enum ColourMode
89
{
@@ -11,7 +12,6 @@ public enum ColourMode
1112
Background
1213
}
1314

14-
1515
public class DisplayFormatter : IFormatter
1616
{
1717
private static int FinalPadding = 2;
@@ -128,7 +128,7 @@ static string PadBoth(string source, int totalLength, char paddingChar = ' ')
128128
}
129129

130130

131-
public String JoinTruthTables(params string[] tables)
131+
public string JoinTruthTables(params string[] tables)
132132
{
133133
var sb = new StringBuilder();
134134

‎BooleanExpressionParser/Program.cs‎ renamed to ‎BooleanExpressionParser.CLI/Program.cs‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,10 @@
1-
using System.CommandLine;
1+
using System.CommandLine;
22
using System.Text;
3-
using BooleanExpressionParser.Formatter;
3+
using System;
44
using Spectre.Console;
5+
using BooleanExpressionParser.CLI.Formatters;
56

6-
namespace BooleanExpressionParser;
7+
namespace BooleanExpressionParser.CLI;
78

89

910
enum OutputType

‎BooleanExpressionParser.CLI/Properties/launchSettings.json‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
{
2+
"profiles": {
3+
"BooleanExpressionParser.CLI - table": {
4+
"commandName": "Project",
5+
"commandLineArgs": "table"
6+
},
7+
"BooleanExpressionParser.CLI - convert": {
8+
"commandName": "Project",
9+
"commandLineArgs": "convert"
10+
}
11+
}
12+
}

‎BooleanExpressionParserWeb/BooleanExpressionParserWeb/Client/App.razor‎ renamed to ‎BooleanExpressionParser.Web/Client/App.razor‎

File renamed without changes.

‎BooleanExpressionParserWeb/BooleanExpressionParserWeb/Client/BooleanExpressionParserWeb.Client.csproj‎ renamed to ‎BooleanExpressionParser.Web/Client/BooleanExpressionParser.Web.Client.csproj‎

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -14,17 +14,12 @@
1414
</ItemGroup>
1515

1616
<ItemGroup>
17-
<ProjectReference Include="..\Shared\BooleanExpressionParserWeb.Shared.csproj" />
18-
</ItemGroup>
19-
20-
21-
<ItemGroup>
22-
<ProjectReference Include="..\..\..\BooleanExpressionParser\BooleanExpressionParser.csproj"/>
17+
<ProjectReference Include="..\Shared\BooleanExpressionParser.Web.Shared.csproj" />
18+
<ProjectReference Include="..\..\BooleanExpressionParser\BooleanExpressionParser.csproj" />
2319
</ItemGroup>
2420

2521
<ItemGroup>
2622
<ServiceWorker Include="wwwroot\service-worker.js" PublishedContent="wwwroot\service-worker.published.js" />
27-
<ProjectReference Include="..\..\..\BooleanExpressionParser\BooleanExpressionParser.csproj" />
28-
</ItemGroup>
23+
</ItemGroup>
2924

3025
</Project>

‎BooleanExpressionParserWeb/BooleanExpressionParserWeb/Client/Components/NavBar.razor‎ renamed to ‎BooleanExpressionParser.Web/Client/Components/NavBar.razor‎

File renamed without changes.

‎BooleanExpressionParserWeb/BooleanExpressionParserWeb/Client/Components/NavBar.razor.css‎ renamed to ‎BooleanExpressionParser.Web/Client/Components/NavBar.razor.css‎

File renamed without changes.

‎BooleanExpressionParserWeb/BooleanExpressionParserWeb/Client/HTMLFormatter.cs‎ renamed to ‎BooleanExpressionParser.Web/Client/Formatters/HTMLFormatter.cs‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,7 @@
1-
using BooleanExpressionParser;
2-
using BooleanExpressionParser.Formatter;
1+
using BooleanExpressionParser.Tokens;
32
using System.Text;
43

5-
namespace BooleanExpressionParserWeb.Client;
4+
namespace BooleanExpressionParser.Web.Client.Formatters;
65

76
public class HTMLFormatter : IFormatter
87
{

0 commit comments

Comments
 (0)