Updated namespace to reflect the nuget package

BLM16 · Dec 28, 2021 · 9f15462 · 9f15462
1 parent f79bc5d
commit 9f15462
Show file tree

Hide file tree

Showing 13 changed files with 26 additions and 32 deletions.
diff --git a/Calculator.Examples/ConsoleIO.cs b/Calculator.Examples/ConsoleIO.cs
@@ -1,28 +1,20 @@
 using System;
-using Calculator;
+using BLM16.Util.Calculator;
 
-namespace Examples;
-
-class ConsoleIO
+while (true)
 {
-    static void Main(string[] args)
+    try
     {
-        while (true)
-        {
-            try
-            {
-                Console.Write("Enter your equation: ");
-                var eq = Console.ReadLine();
-
-                var calculator = new Calculator.Calculator();
-                var res = calculator.Calculate(eq);
+        Console.Write("Enter your equation: ");
+        var eq = Console.ReadLine();
+
+        var calculator = new Calculator();
+        var res = calculator.Calculate(eq);
 
-                Console.WriteLine($"Result: {res}\n");
-            }
-            catch (MathSyntaxException e)
-            {
-                Console.WriteLine(e + "\n");
-            }
-        }
+        Console.WriteLine($"Result: {res}\n");
+    }
+    catch (MathSyntaxException e)
+    {
+        Console.WriteLine(e + "\n");
     }
 }
diff --git a/Calculator.Tests/Calculator.Tests.csproj b/Calculator.Tests/Calculator.Tests.csproj
@@ -13,6 +13,7 @@
     <Version>2.0.0</Version>
     <PackageLicenseFile>LICENSE</PackageLicenseFile>
     <PackageTags>calculator</PackageTags>
+    <RootNamespace>BLM16.Util.$(MSBuildProjectName.Replace(" ", "_"))</RootNamespace>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/Calculator.Tests/LexerTests.cs b/Calculator.Tests/LexerTests.cs
@@ -1,7 +1,7 @@
 using Microsoft.VisualStudio.TestTools.UnitTesting;
 using System.Collections.Generic;
 
-namespace Calculator.Tests;
+namespace BLM16.Util.Calculator.Tests;
 
 /// <summary>
 /// Contains the tests for the Lexer class

diff --git a/Calculator.Tests/ParserTests.cs b/Calculator.Tests/ParserTests.cs
@@ -1,7 +1,7 @@
 using Microsoft.VisualStudio.TestTools.UnitTesting;
 using System.Collections.Generic;
 
-namespace Calculator.Tests;
+namespace BLM16.Util.Calculator.Tests;
 
 /// <summary>
 /// Contains the tests for the Parser class

diff --git a/Calculator.Tests/StandardizerTests.cs b/Calculator.Tests/StandardizerTests.cs
@@ -1,6 +1,6 @@
 using Microsoft.VisualStudio.TestTools.UnitTesting;
 
-namespace Calculator.Tests;
+namespace BLM16.Util.Calculator.Tests;
 
 /// <summary>
 /// Contains the tests for the Standardizer class

diff --git a/Calculator/Calculator.cs b/Calculator/Calculator.cs
@@ -1,5 +1,5 @@
 [assembly: System.Runtime.CompilerServices.InternalsVisibleTo("Calculator.Tests")]
-namespace Calculator;
+namespace BLM16.Util.Calculator;
 
 /// <summary>
 /// Contains the required logic to evaluate an equation from a string

diff --git a/Calculator/Calculator.csproj b/Calculator/Calculator.csproj
@@ -8,14 +8,15 @@
     <Copyright>Copyright © 2021 Bradley Myers. All rights reserved.</Copyright>
     <RepositoryUrl>https://github.com/BLM16/Tokenized-Calculator</RepositoryUrl>
     <RepositoryType>git</RepositoryType>
-    <Version>2.0.0</Version>
+    <Version>2.1.0</Version>
     <PackageLicenseFile>LICENSE</PackageLicenseFile>
     <PackageTags>calculator; math; solve</PackageTags>
     <PackageId>BLM16.Util.$(AssemblyName)</PackageId>
     <GeneratePackageOnBuild>True</GeneratePackageOnBuild>
     <PackageReadmeFile>README.md</PackageReadmeFile>
     <Description>This library parses and solves math equations from strings. Order of Operations Rules are followed.</Description>
     <NeutralLanguage>en-CA</NeutralLanguage>
+    <RootNamespace>BLM16.Util.$(MSBuildProjectName.Replace(" ", "_"))</RootNamespace>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/Calculator/Lexer.cs b/Calculator/Lexer.cs
@@ -1,7 +1,7 @@
 using System.Collections.Generic;
 using System.Linq;
 
-namespace Calculator;
+namespace BLM16.Util.Calculator;
 
 /// <summary>
 /// Has the logic to tokenize an equation

diff --git a/Calculator/MathSyntaxException.cs b/Calculator/MathSyntaxException.cs
@@ -1,6 +1,6 @@
 using System;
 
-namespace Calculator;
+namespace BLM16.Util.Calculator;
 
 /// <summary>
 /// Exception for malformed equations

diff --git a/Calculator/Operator.cs b/Calculator/Operator.cs
@@ -1,7 +1,7 @@
 using System;
 using System.Collections.Generic;
 
-namespace Calculator;
+namespace BLM16.Util.Calculator;
 
 /// <summary>
 /// An operator used by the calculator

diff --git a/Calculator/Parser.cs b/Calculator/Parser.cs
@@ -1,6 +1,6 @@
 using System.Collections.Generic;
 
-namespace Calculator;
+namespace BLM16.Util.Calculator;
 
 /// <summary>
 /// Has the logic to evaluate an equation

diff --git a/Calculator/Standardizer.cs b/Calculator/Standardizer.cs
@@ -2,7 +2,7 @@
 using System.Linq;
 using System.Text.RegularExpressions;
 
-namespace Calculator;
+namespace BLM16.Util.Calculator;
 
 /// <summary>
 /// Has the logic to standardize an equation into something the calculator can parse

diff --git a/Calculator/Token.cs b/Calculator/Token.cs
@@ -1,6 +1,6 @@
 using System;
 
-namespace Calculator;
+namespace BLM16.Util.Calculator;
 
 /// <summary>
 /// Builtin token types