Fixed references, namespaces

tomc128 · tomc128 · commit d8aff7db9444 · 2022-12-14T21:38:45.000Z
diff --git a/BooleanExpressionParser.CLI/BooleanExpressionParser.CLI.csproj b/BooleanExpressionParser.CLI/BooleanExpressionParser.CLI.csproj
@@ -12,4 +12,8 @@
 		<PackageReference Include="System.CommandLine" Version="2.0.0-beta4.22272.1" />
 	</ItemGroup>
 
+	<ItemGroup>
+	  <ProjectReference Include="..\BooleanExpressionParser\BooleanExpressionParser.csproj" />
+	</ItemGroup>
+
 </Project>
diff --git a/BooleanExpressionParser.CLI/Formatters/BasicFormatter.cs b/BooleanExpressionParser.CLI/Formatters/BasicFormatter.cs
@@ -1,8 +1,8 @@
 using System.Text;
-using BooleanExpressionParser.Formatter;
-
-namespace BooleanExpressionParser.CLI.Formatter;
+using BooleanExpressionParser;
+using BooleanExpressionParser.Tokens;
 
+namespace BooleanExpressionParser.CLI.Formatters;
 
 public class BasicFormatter : IFormatter
 {
diff --git a/BooleanExpressionParser.CLI/Formatters/DisplayFormatter.cs b/BooleanExpressionParser.CLI/Formatters/DisplayFormatter.cs
@@ -1,9 +1,9 @@
 using System.Globalization;
 using System.Text;
+using BooleanExpressionParser.Tokens;
 using Spectre.Console;
-using BooleanExpressionParser.Formatter;
 
-namespace BooleanExpressionParser.CLI.Formatter;
+namespace BooleanExpressionParser.CLI.Formatters;
 
 public enum ColourMode
 {
@@ -12,7 +12,6 @@ public enum ColourMode
     Background
 }
 
-
 public class DisplayFormatter : IFormatter
 {
     private static int FinalPadding = 2;
@@ -129,7 +128,7 @@ static string PadBoth(string source, int totalLength, char paddingChar = ' ')
     }
 
 
-    public String JoinTruthTables(params string[] tables)
+    public string JoinTruthTables(params string[] tables)
     {
         var sb = new StringBuilder();
 
diff --git a/BooleanExpressionParser.CLI/Program.cs b/BooleanExpressionParser.CLI/Program.cs
@@ -2,6 +2,7 @@
 using System.Text;
 using System;
 using Spectre.Console;
+using BooleanExpressionParser.CLI.Formatters;
 
 namespace BooleanExpressionParser.CLI;
 
diff --git a/BooleanExpressionParser.CLI/Properties/launchSettings.json b/BooleanExpressionParser.CLI/Properties/launchSettings.json
@@ -0,0 +1,12 @@
+{
+  "profiles": {
+    "BooleanExpressionParser.CLI - table": {
+      "commandName": "Project",
+      "commandLineArgs": "table"
+    },
+    "BooleanExpressionParser.CLI - convert": {
+      "commandName": "Project",
+      "commandLineArgs": "convert"
+    }
+  }
+}
diff --git a/BooleanExpressionParser.Web/Client/BooleanExpressionParser.Web.Client.csproj b/BooleanExpressionParser.Web/Client/BooleanExpressionParser.Web.Client.csproj
@@ -15,16 +15,11 @@
 
 	<ItemGroup>
 		<ProjectReference Include="..\Shared\BooleanExpressionParser.Web.Shared.csproj" />
-	</ItemGroup>
-
-
-	<ItemGroup>
-		<ProjectReference Include="..\..\..\BooleanExpressionParser\BooleanExpressionParser.csproj" />
+		<ProjectReference Include="..\..\BooleanExpressionParser\BooleanExpressionParser.csproj" />
 	</ItemGroup>
 
 	<ItemGroup>
 		<ServiceWorker Include="wwwroot\service-worker.js" PublishedContent="wwwroot\service-worker.published.js" />
-			<ProjectReference Include="..\..\..\BooleanExpressionParser\BooleanExpressionParser.csproj" />
-</ItemGroup>
+	</ItemGroup>
 
 </Project>
diff --git a/BooleanExpressionParser.Web/Client/Formatters/HTMLFormatter.cs b/BooleanExpressionParser.Web/Client/Formatters/HTMLFormatter.cs
@@ -1,8 +1,7 @@
-﻿using BooleanExpressionParser;
-using BooleanExpressionParser.Formatter;
+﻿using BooleanExpressionParser.Tokens;
 using System.Text;
 
-namespace BooleanExpressionParserWeb.Client;
+namespace BooleanExpressionParser.Web.Client.Formatters;
 
 public class HTMLFormatter : IFormatter
 {
diff --git a/BooleanExpressionParser.Web/Client/MainLayout.razor b/BooleanExpressionParser.Web/Client/MainLayout.razor
@@ -1,5 +1,5 @@
 ﻿@inherits LayoutComponentBase
-@using BooleanExpressionParserWeb.Client.Components;
+@using BooleanExpressionParser.Web.Client.Components;
 
 
 <div id="nav-bar">
diff --git a/BooleanExpressionParser.Web/Client/Pages/TruthTable.razor b/BooleanExpressionParser.Web/Client/Pages/TruthTable.razor
@@ -1,5 +1,6 @@
 ﻿@using BooleanExpressionParser;
-@using BooleanExpressionParser.Formatter;
+@using BooleanExpressionParser.Web.Client.Formatters;
+
 @page "/truth-table"
 
 <PageTitle>Truth Table Generator</PageTitle>
diff --git a/BooleanExpressionParser.Web/Client/Program.cs b/BooleanExpressionParser.Web/Client/Program.cs
@@ -1,4 +1,4 @@
-using BooleanExpressionParserWeb.Client;
+using BooleanExpressionParser.Web.Client;
 using Microsoft.AspNetCore.Components.Web;
 using Microsoft.AspNetCore.Components.WebAssembly.Hosting;
 
diff --git a/BooleanExpressionParser.Web/Client/_Imports.razor b/BooleanExpressionParser.Web/Client/_Imports.razor
@@ -4,4 +4,3 @@
 @using Microsoft.AspNetCore.Components.Web
 @using Microsoft.AspNetCore.Components.WebAssembly.Http
 @using Microsoft.JSInterop
-@using BooleanExpressionParserWeb.Client
diff --git a/BooleanExpressionParser.Web/Client/wwwroot/index.html b/BooleanExpressionParser.Web/Client/wwwroot/index.html
@@ -3,13 +3,13 @@
 
 <head>
     <meta charset="utf-8" />
-    <title>BooleanExpressionParserWeb</title>
+    <title>BooleanExpressionParser.Web</title>
     <base href="/" />
     <link href="css/app.css" rel="stylesheet" />
     <link href="manifest.json" rel="manifest" />
     
     <!-- If you add any scoped CSS files, uncomment the following to load them-->
-    <link href="BooleanExpressionParserWeb.Client.styles.css" rel="stylesheet" /> 
+    <link href="BooleanExpressionParser.Web.Client.styles.css" rel="stylesheet" /> 
 </head>
 
 <body>
diff --git a/boolean-expression-parser.sln b/boolean-expression-parser.sln
@@ -11,10 +11,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BooleanExpressionParser.Web
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BooleanExpressionParser.Web.Shared", "BooleanExpressionParser.Web\Shared\BooleanExpressionParser.Web.Shared.csproj", "{18A5B16B-54E6-4450-8AB3-A92AE6D51AA0}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BooleanExpressionParser.CLI", "BooleanExpressionParser.CLI\BooleanExpressionParser.CLI.csproj", "{A2DF50D3-FD03-409E-AF9F-9D7817FFAA35}"
-	ProjectSection(ProjectDependencies) = postProject
-		{3703002C-09C7-47F1-90EA-2D4F806CBE9A} = {3703002C-09C7-47F1-90EA-2D4F806CBE9A}
-	EndProjectSection
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BooleanExpressionParser.CLI", "BooleanExpressionParser.CLI\BooleanExpressionParser.CLI.csproj", "{A2DF50D3-FD03-409E-AF9F-9D7817FFAA35}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution

Original file line number	Diff line number	Diff line change
`@@ -1,9 +1,9 @@`
`1`	`1`	`using System.Globalization;`
`2`	`2`	`using System.Text;`
	`3`	`+using BooleanExpressionParser.Tokens;`
`3`	`4`	`using Spectre.Console;`
`4`		`-using BooleanExpressionParser.Formatter;`
`5`	`5`
`6`		`-namespace BooleanExpressionParser.CLI.Formatter;`
	`6`	`+namespace BooleanExpressionParser.CLI.Formatters;`
`7`	`7`
`8`	`8`	`public enum ColourMode`
`9`	`9`	`{`
`@@ -12,7 +12,6 @@ public enum ColourMode`
`12`	`12`	`Background`
`13`	`13`	`}`
`14`	`14`
`15`		`-`
`16`	`15`	`public class DisplayFormatter : IFormatter`
`17`	`16`	`{`
`18`	`17`	`private static int FinalPadding = 2;`
`@@ -129,7 +128,7 @@ static string PadBoth(string source, int totalLength, char paddingChar = ' ')`
`129`	`128`	`}`
`130`	`129`
`131`	`130`
`132`		`- public String JoinTruthTables(params string[] tables)`
	`131`	`+ public string JoinTruthTables(params string[] tables)`
`133`	`132`	`{`
`134`	`133`	`var sb = new StringBuilder();`
`135`	`134`
Original file line number	Diff line number	Diff line change
`@@ -1,8 +1,7 @@`
`1`		`-using BooleanExpressionParser;`
`2`		`-using BooleanExpressionParser.Formatter;`
	`1`	`+using BooleanExpressionParser.Tokens;`
`3`	`2`	`using System.Text;`
`4`	`3`
`5`		`-namespace BooleanExpressionParserWeb.Client;`
	`4`	`+namespace BooleanExpressionParser.Web.Client.Formatters;`
`6`	`5`
`7`	`6`	`public class HTMLFormatter : IFormatter`
`8`	`7`	`{`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-using BooleanExpressionParserWeb.Client;`
	`1`	`+using BooleanExpressionParser.Web.Client;`
`2`	`2`	`using Microsoft.AspNetCore.Components.Web;`
`3`	`3`	`using Microsoft.AspNetCore.Components.WebAssembly.Hosting;`
`4`	`4`