Merge branch 'rcheung9-master'

CodySchrank · Jul 11, 2019 · c389dbb · c389dbb
2 parents 8f6f61d + 2905393
commit c389dbb
Show file tree

Hide file tree

Showing 6 changed files with 16 additions and 18 deletions.
diff --git a/.gitignore b/.gitignore
@@ -4,4 +4,10 @@ bin/
 artifacts/
 models/
 .dotnet/
-.vscode/
+.vscode/
+Source/MTT/.vs/MTT/v16/Server/sqlite3/db.lock
+Source/MTT/.vs/MTT/v16/Server/sqlite3/storage.ide
+Source/MTT/.vs/MTT/v16/Server/sqlite3/storage.ide-shm
+Source/MTT/.vs/MTT/v16/Server/sqlite3/storage.ide-wal
+Source/TestConsole/Program.cs
+Source/TestConsole/TestConsole.csproj
diff --git a/Example/Example.csproj b/Example/Example.csproj
@@ -5,8 +5,8 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <!-- <PackageReference Include="MTT" Version="0.5.7-*" PrivateAssets="All" /> -->
-    <PackageReference Include="MTT" Version="0.5.7"/>
+    <!-- <PackageReference Include="MTT" Version="0.5.8-*" PrivateAssets="All" /> -->
+    <PackageReference Include="MTT" Version="0.5.8"/>
   </ItemGroup>
 
   <Target Name="ConvertMain" BeforeTargets="PrepareForBuild">

diff --git a/Example/Resources/Vehicles/Vehicle.cs b/Example/Resources/Vehicles/Vehicle.cs
@@ -14,9 +14,9 @@ public abstract class Vehicle : Entity
 
         public int? Mileage;
 
-        public VehicleState Condition { get; set; }  // this is an enum of type int
+        public Dictionary<string, string> keyValuePair { get; set; }
 
-        public VehicleStateHex ConditionInHex { get; set; }
+        public VehicleState Condition { get; set; }  // this is an enum of type int
 
         public virtual ICollection<Part> Parts { get; set; }
     }

diff --git a/Example/Resources/Vehicles/VehicleStateHex.cs b/Example/Resources/Vehicles/VehicleStateHex.cs
diff --git a/Source/MTT/ConvertMain.cs b/Source/MTT/ConvertMain.cs
@@ -509,7 +509,10 @@ private bool IsContructor(string line)
 
         private string[] ExplodeLine(string line)
         {
-            var l = line;
+            var regex = new Regex("\\s*,\\s*");
+
+            var l = regex.Replace(line, ",");
+
             return l
                 .Replace("public", String.Empty)
                 .Replace("static", String.Empty)

diff --git a/Source/MTT/MTT.csproj b/Source/MTT/MTT.csproj
@@ -8,7 +8,7 @@
     <!-- Change the default location where NuGet will put the build output -->
     <BuildOutputTargetFolder>tasks</BuildOutputTargetFolder>
     <!-- set the version automatically -->
-    <VersionPrefix>0.5.7</VersionPrefix>
+    <VersionPrefix>0.5.8</VersionPrefix>
     <!-- 
         The suffix is required because nuget will only update if the package is newer, this tricks it. 
         note: 0.1.5 has precedence over 0.1.5-build123412341