V2.4 bug fixes

thiagoloureiro · Oct 27, 2018 · 18945f1 · 18945f1
1 parent 65a36cf
commit 18945f1
Show file tree

Hide file tree

Showing 10 changed files with 73 additions and 8 deletions.
diff --git a/Dapper.Crud.VSExtension/Dapper.Crud.VSExtension.csproj b/Dapper.Crud.VSExtension/Dapper.Crud.VSExtension.csproj
@@ -84,6 +84,12 @@
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
       <IncludeInVSIX>true</IncludeInVSIX>
     </Content>
+    <Content Include="dll\System.Web.Mvc.dll">
+      <IncludeInVSIX>true</IncludeInVSIX>
+    </Content>
+    <Content Include="dll\System.Web.Optimization.dll">
+      <IncludeInVSIX>true</IncludeInVSIX>
+    </Content>
     <Content Include="roslyn\csc.exe.config">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
       <IncludeInVSIX>true</IncludeInVSIX>

diff --git a/Dapper.Crud.VSExtension/Helpers/AssemblyHelper.cs b/Dapper.Crud.VSExtension/Helpers/AssemblyHelper.cs
@@ -32,8 +32,8 @@ private static Assembly BuildAssembly(string code)
                 compilerparams.ReferencedAssemblies.Add("System.ComponentModel.DataAnnotations.dll");
                 compilerparams.ReferencedAssemblies.Add("System.Web.dll");
                 compilerparams.ReferencedAssemblies.Add("System.Web.Abstractions.dll");
-                compilerparams.ReferencedAssemblies.Add("System.Web.Mvc.dll");
-                compilerparams.ReferencedAssemblies.Add("System.Web.Optimization.dll");
+                // compilerparams.ReferencedAssemblies.Add("System.Web.Mvc.dll");
+                // compilerparams.ReferencedAssemblies.Add("System.Web.Optimization.dll");
 
                 CompilerResults results =
                     compiler.CompileAssemblyFromSource(compilerparams, code);

diff --git a/Dapper.Crud.VSExtension/Helpers/ClassGenerator.cs b/Dapper.Crud.VSExtension/Helpers/ClassGenerator.cs
@@ -1,11 +1,13 @@
-using System.Text;
+using System.Linq;
+using System.Text;
 
 namespace Dapper.Crud.VSExtension.Helpers
 {
     public static class ClassGenerator
     {
         public static string GenerateClassBody(string model, bool interfaceEnabled)
         {
+            model = FixClassName(model);
             var sb = new StringBuilder();
             sb.AppendLine(interfaceEnabled
                 ? $"public class {model}Repository : I{model}Repository"
@@ -14,5 +16,15 @@ public static string GenerateClassBody(string model, bool interfaceEnabled)
 
             return sb.ToString();
         }
+
+        private static string FixClassName(string model)
+        {
+            if (model.Contains("\\"))
+            {
+                var str = model.Split('\\');
+                model = str.Last(); // last item of the array
+            }
+            return model;
+        }
     }
 }
diff --git a/Dapper.Crud.VSExtension/Helpers/DapperGenerator.cs b/Dapper.Crud.VSExtension/Helpers/DapperGenerator.cs
@@ -47,6 +47,7 @@ public static string SelectJoin(List<string> models, List<IList<PropertyInfo>> p
 
         public static string Select(string model, IList<PropertyInfo> properties, bool generateMethod, bool generateClass)
         {
+            model = FixClassName(model);
             var space = "";
 
             if (generateMethod)
@@ -70,6 +71,16 @@ public static string Select(string model, IList<PropertyInfo> properties, bool g
             return sb.ToString();
         }
 
+        private static string FixClassName(string model)
+        {
+            if (model.Contains("\\"))
+            {
+                var str = model.Split('\\');
+                model = str.Last(); // last item of the array
+            }
+            return model;
+        }
+
         public static string Insert(string model, IList<PropertyInfo> properties, bool generateMethod, bool generateClass, bool autoIncrement)
         {
             var space = "";

diff --git a/Dapper.Crud.VSExtension/Helpers/InterfaceGenerator.cs b/Dapper.Crud.VSExtension/Helpers/InterfaceGenerator.cs
@@ -1,11 +1,14 @@
-using System.Text;
+using System.Linq;
+using System.Text;
 
 namespace Dapper.Crud.VSExtension.Helpers
 {
     public static class InterfaceGenerator
     {
         public static string GenerateInterfaceBody(string model)
         {
+            model = FixClassName(model);
+
             var sb = new StringBuilder();
             sb.AppendLine("");
             sb.AppendLine($"public interface I{model}Repository");
@@ -16,6 +19,8 @@ public static string GenerateInterfaceBody(string model)
 
         public static string GenerateSelect(string model)
         {
+            model = FixClassName(model);
+
             var sb = new StringBuilder();
             sb.AppendLine($"    List<{model}> Select{model}();");
 
@@ -24,6 +29,8 @@ public static string GenerateSelect(string model)
 
         public static string GenerateInsert(string model)
         {
+            model = FixClassName(model);
+
             var sb = new StringBuilder();
             sb.AppendLine($"    void Insert{model}({model} {model.ToLower()});");
 
@@ -32,6 +39,8 @@ public static string GenerateInsert(string model)
 
         public static string GenerateUpdate(string model)
         {
+            model = FixClassName(model);
+
             var sb = new StringBuilder();
             sb.AppendLine($"    void Update{model}({model} {model.ToLower()});");
 
@@ -40,10 +49,22 @@ public static string GenerateUpdate(string model)
 
         public static string GenerateDelete(string model)
         {
+            model = FixClassName(model);
+
             var sb = new StringBuilder();
             sb.AppendLine($"    void Delete{model}({model} {model.ToLower()});");
 
             return sb.ToString();
         }
+
+        private static string FixClassName(string model)
+        {
+            if (model.Contains("\\"))
+            {
+                var str = model.Split('\\');
+                model = str.Last(); // last item of the array
+            }
+            return model;
+        }
     }
 }
diff --git a/Dapper.Crud.VSExtension/Helpers/MethodGenerator.cs b/Dapper.Crud.VSExtension/Helpers/MethodGenerator.cs
@@ -1,4 +1,5 @@
-using System.Text;
+using System.Linq;
+using System.Text;
 
 namespace Dapper.Crud.VSExtension.Helpers
 {
@@ -7,6 +8,7 @@ public static class MethodGenerator
         public static string GenerateSelect(string content, string model, bool generateClass)
         {
             var space = "";
+            model = FixClassName(model);
 
             if (generateClass)
                 space = "    ";
@@ -23,6 +25,7 @@ public static string GenerateSelect(string content, string model, bool generateC
         public static string GenerateInsert(string content, string model, bool generateClass)
         {
             var space = "";
+            model = FixClassName(model);
 
             if (generateClass)
                 space = "    ";
@@ -39,6 +42,7 @@ public static string GenerateInsert(string content, string model, bool generateC
         public static string GenerateUpdate(string content, string model, bool generateClass)
         {
             var space = "";
+            model = FixClassName(model);
 
             if (generateClass)
                 space = "    ";
@@ -55,6 +59,7 @@ public static string GenerateUpdate(string content, string model, bool generateC
         public static string GenerateDelete(string content, string model, bool generateClass)
         {
             var space = "";
+            model = FixClassName(model);
 
             if (generateClass)
                 space = "    ";
@@ -67,5 +72,15 @@ public static string GenerateDelete(string content, string model, bool generateC
 
             return sb.ToString();
         }
+
+        private static string FixClassName(string model)
+        {
+            if (model.Contains("\\"))
+            {
+                var str = model.Split('\\');
+                model = str.Last(); // last item of the array
+            }
+            return model;
+        }
     }
 }
diff --git a/Dapper.Crud.VSExtension/Properties/AssemblyInfo.cs b/Dapper.Crud.VSExtension/Properties/AssemblyInfo.cs
@@ -29,5 +29,5 @@
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("2.3.0.0")]
-[assembly: AssemblyFileVersion("2.3.0.0")]
+[assembly: AssemblyVersion("2.4.0.0")]
+[assembly: AssemblyFileVersion("2.4.0.0")]
diff --git a/Dapper.Crud.VSExtension/dll/System.Web.Mvc.dll b/Dapper.Crud.VSExtension/dll/System.Web.Mvc.dll
diff --git a/Dapper.Crud.VSExtension/dll/System.Web.Optimization.dll b/Dapper.Crud.VSExtension/dll/System.Web.Optimization.dll
diff --git a/Dapper.Crud.VSExtension/source.extension.vsixmanifest b/Dapper.Crud.VSExtension/source.extension.vsixmanifest
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <PackageManifest Version="2.0.0" xmlns="http://schemas.microsoft.com/developer/vsx-schema/2011" xmlns:d="http://schemas.microsoft.com/developer/vsx-schema-design/2011">
     <Metadata>
-        <Identity Id="d7261d0b-5f95-456b-9b6a-b127d9afc8e4" Version="2.3" Language="en-US" Publisher="Thiago Loureiro" />
+        <Identity Id="d7261d0b-5f95-456b-9b6a-b127d9afc8e4" Version="2.4" Language="en-US" Publisher="Thiago Loureiro" />
         <DisplayName>Dapper Crud Generator</DisplayName>
         <Description xml:space="preserve">Generate CRUD easily with Dapper from your existing Models</Description>
         <MoreInfo>https://github.com/thiagoloureiro/Dapper.Crud.Extension</MoreInfo>