Support to C# 8.0, several fixes

thiagoloureiro · Jan 13, 2021 · cd809d3 · cd809d3
1 parent a92a97e
commit cd809d3
Show file tree

Hide file tree

Showing 136 changed files with 830 additions and 894 deletions.
diff --git a/Dapper.Crud.Tests/Dapper.Crud.Tests.csproj b/Dapper.Crud.Tests/Dapper.Crud.Tests.csproj
@@ -39,7 +39,7 @@
   </PropertyGroup>
   <ItemGroup>
     <PackageReference Include="MSTest.TestAdapter" Version="2.1.0" />
-    <PackageReference Include="MSTest.TestFramework" Version="2.1.0" />
+    <PackageReference Include="MSTest.TestFramework" Version="2.1.2" />
     <PackageReference Include="xunit">
       <Version>2.4.1</Version>
     </PackageReference>

diff --git a/Dapper.Crud.VSExtension.sln b/Dapper.Crud.VSExtension.sln
@@ -1,7 +1,7 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 15
-VisualStudioVersion = 15.0.27428.2037
+# Visual Studio Version 16
+VisualStudioVersion = 16.0.30804.86
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Dapper.Crud.VSExtension", "Dapper.Crud.VSExtension\Dapper.Crud.VSExtension.csproj", "{E1F9280B-5191-4741-A4A9-C78DE32FFF7E}"
 EndProject

diff --git a/Dapper.Crud.VSExtension/Dapper.Crud.VSExtension.csproj b/Dapper.Crud.VSExtension/Dapper.Crud.VSExtension.csproj
diff --git a/Dapper.Crud.VSExtension/Helpers/AssemblyHelper.cs b/Dapper.Crud.VSExtension/Helpers/AssemblyHelper.cs
@@ -8,6 +8,8 @@ namespace Dapper.Crud.VSExtension.Helpers
 {
     public static class AssemblyHelper
     {
+        public static string codeGlobal;
+
         private static Assembly BuildAssembly(string code)
         {
             using (var compiler = new Microsoft.CodeDom.Providers.DotNetCompilerPlatform.CSharpCodeProvider())
@@ -19,7 +21,7 @@ private static Assembly BuildAssembly(string code)
                 {
                     GenerateExecutable = false,
                     GenerateInMemory = true,
-                    CompilerOptions = "/unsafe /optimize /langversion:7.1"
+                    CompilerOptions = "/unsafe /optimize /langversion:8.0"
                 };
 
                 var assemblies = AppDomain.CurrentDomain
@@ -55,6 +57,7 @@ private static Assembly BuildAssembly(string code)
 
         public static object ExecuteCode(string code, string namespacename, string classname, bool isstatic)
         {
+            codeGlobal = code;
             Assembly asm = BuildAssembly(code);
             classname = FixClassName(classname);
 

diff --git a/Dapper.Crud.VSExtension/Helpers/FileHelper.cs b/Dapper.Crud.VSExtension/Helpers/FileHelper.cs
@@ -56,8 +56,10 @@ public static string GenerateRawStringAllFiles(IEnumerable<string> fileList)
                 var strContent = File.ReadAllLines(file);
                 foreach (var line in strContent)
                 {
-                    if (line.Contains("using"))
+                    if (line.StartsWith("using") && line.EndsWith(";"))
+                    {
                         lstUsings.Add(line);
+                    }
                     else
                         lstContent.Add(line);
                 }

diff --git a/Dapper.Crud.VSExtension/Logger/Logger.cs b/Dapper.Crud.VSExtension/Logger/Logger.cs
@@ -1,6 +1,4 @@
-using Microsoft.VisualStudio.Shell;
-using Microsoft.VisualStudio.Shell.Interop;
-using Microsoft.VisualStudio.Threading;
+using Microsoft.VisualStudio.Shell.Interop;
 using System;
 
 namespace Dapper.Crud.VSExtension
@@ -23,7 +21,7 @@ public static void Log(object message)
             {
                 if (EnsurePane())
                 {
-                    ThreadHelper.Generic.BeginInvoke(() =>
+                    Microsoft.VisualStudio.Shell.ThreadHelper.Generic.BeginInvoke(() =>
                     {
                         _pane.OutputStringThreadSafe(DateTime.Now + ": " + message + Environment.NewLine);
                     });
@@ -39,7 +37,7 @@ private static bool EnsurePane()
         {
             if (_pane == null)
             {
-                ThreadHelper.JoinableTaskFactory.Run(async () =>
+                Microsoft.VisualStudio.Shell.ThreadHelper.JoinableTaskFactory.Run(async () =>
                 {
                     IVsOutputWindow output = (IVsOutputWindow)_provider.GetService(typeof(SVsOutputWindow));
                     if (_pane == null)

diff --git a/Dapper.Crud.VSExtension/frmExtension.Designer.cs b/Dapper.Crud.VSExtension/frmExtension.Designer.cs