Merge pull request #63 from codingadventures/LINQBridgeVs2.0

LINQBridgeVs version 2.0

Author: codingadventures

Src/BridgeVs.VsPackage/Bridge.png renamed to Src/BridgeVs.AsyncVsPackage/Bridge.png

@@ -28,15 +28,13 @@
 using System.ComponentModel.Design;
 using System.IO;
 using System.Linq;
-using System.Windows;
-using BridgeVs.Shared.Common;
 using BridgeVs.VsPackage.Helper;
 using BridgeVs.VsPackage.Helper.Command;
 using BridgeVs.VsPackage.Helper.Configuration;
 using EnvDTE;
 using Project = EnvDTE.Project;
 
-namespace BridgeVs.VsPackage
+namespace BridgeVs.VisualStudio.AsyncExtension
 {
     public class BridgeVsExtension
     {
@@ -57,6 +55,7 @@ private IEnumerable<Project> AllProjects
         {
             get
             {
+                Microsoft.VisualStudio.Shell.ThreadHelper.ThrowIfNotOnUIThread();
                 Projects projects = _application.Solution.Projects;
                 if (projects == null)
                     return Enumerable.Empty<Project>();
@@ -71,6 +70,7 @@ where IsSupported(project.UniqueName)
 
         public void Execute(CommandAction action)
         {
+            Microsoft.VisualStudio.Shell.ThreadHelper.ThrowIfNotOnUIThread();
             List<Project> projects = AllProjects.ToList();
 
             if (projects.Count == 0)
@@ -79,12 +79,12 @@ public void Execute(CommandAction action)
             if (BridgeCommand.IsEveryProjectSupported(projects, _application.Version, _application.Edition))
             {
                 BridgeCommand.ActivateBridgeVsOnSolution(action, projects, SolutionName, _application.Version,
-                    _application.Edition);
+                    _application.Edition, Path.GetDirectoryName(_application.Solution.FileName));
             }
             else
             {
                 string message = $@"Solution {SolutionName} contains one or more un-supported projects. ASP.NET Core, .NET Core, .NET standard and UAP are not supported by LINQBridgeVs.";
-                MessageBox.Show(message);
+                System.Windows.MessageBox.Show(message);
             }
         }
 
@@ -97,14 +97,18 @@ public void UpdateCommand(MenuCommand cmd, CommandAction action)
 
         private CommandStates GetStatus(CommandAction action)
         {
+            Microsoft.VisualStudio.Shell.ThreadHelper.ThrowIfNotOnUIThread();
+
             CommandStates result = CommandStates.Visible;
 
             bool isBridgeVsConfigured = PackageConfigurator.IsBridgeVsConfigured(_application.Version);
 
             if (!isBridgeVsConfigured)
                 return result; //just show it as visible
 
-            bool isSolutionEnabled = CommonRegistryConfigurations.IsSolutionEnabled(SolutionName, _application.Version);
+            string solutionDir = Path.GetDirectoryName(_application.Solution.FileName);
+            string directoryTarget = Path.Combine(solutionDir, "Directory.Build.targets");
+            bool isSolutionEnabled = File.Exists(directoryTarget);
 
             if (isSolutionEnabled && action == CommandAction.Disable || !isSolutionEnabled && action == CommandAction.Enable)
                 result |= CommandStates.Enabled;

Src/BridgeVs.VsPackage/BridgeVs.VsPackage.csproj renamed to Src/BridgeVs.AsyncVsPackage/BridgeVs.VisualStudio.AsyncExtension.csproj

@@ -24,6 +24,8 @@
 #endregion
 
 using BridgeVs.Shared.Common;
+using BridgeVs.Shared.FileSystem;
+using BridgeVs.VsPackage.Helper.Configuration;
 using EnvDTE;
 using System;
 using System.Collections.Generic;
@@ -36,6 +38,7 @@ namespace BridgeVs.VsPackage.Helper.Command
 {
     public static class BridgeCommand
     {
+        private const string DirectoryBuildTargets = "Directory.Build.targets";
         private static readonly List<string> UnsupportedFrameworks = new List<string>(20)
         {
             "netstandard",
@@ -51,8 +54,11 @@ public static class BridgeCommand
 
         public static void ActivateBridgeVsOnSolution(CommandAction action, List<Project> projects, string solutionName,
             string vsVersion,
-            string vsEdition)
+            string vsEdition,
+            string solutionFolder)
         {
+            Microsoft.VisualStudio.Shell.ThreadHelper.ThrowIfNotOnUIThread();
+
             List<BridgeProjectInfo> executeParams = new List<BridgeProjectInfo>();
 
             //enable each individual project by mapping the assembly name and location to a registry entry
@@ -70,6 +76,7 @@ public static void ActivateBridgeVsOnSolution(CommandAction action, List<Project
                 if (project.Object is VSProject vsProject && vsProject.References != null)
                 {
                     references = from Reference reference in vsProject.References
+                                 where reference.Path != null
                                  where reference.SourceProject == null //it means it's an assembly reference
                                  where !reference.Path.Contains(".NETFramework") && !reference.Path.Contains("Microsoft") //no .net framework assembly
                                  select reference.Path;
@@ -83,9 +90,14 @@ public static void ActivateBridgeVsOnSolution(CommandAction action, List<Project
             {
                 case CommandAction.Enable:
                     CommonRegistryConfigurations.BridgeSolution(solutionName, vsVersion, executeParams);
+                    //copy directory build target to the solution folder
+                    string target = PackageConfigurator.GetInstallationFolder(vsVersion);
+                    File.Copy(Path.Combine(target, "Targets", DirectoryBuildTargets), Path.Combine(solutionFolder, DirectoryBuildTargets), true);
                     break;
                 case CommandAction.Disable:
                     CommonRegistryConfigurations.UnBridgeSolution(solutionName, vsVersion);
+                    //delete directory build target
+                    File.Delete(Path.Combine(solutionFolder, DirectoryBuildTargets));
                     break;
             }
 
@@ -99,6 +111,8 @@ public static void ActivateBridgeVsOnSolution(CommandAction action, List<Project
         public static bool IsEveryProjectSupported(List<Project> projects, string applicationVersion,
             string applicationEdition)
         {
+            Microsoft.VisualStudio.Shell.ThreadHelper.ThrowIfNotOnUIThread();
+
             foreach (Project project in projects)
             {
                 string targetFramework = project.Properties.Item("TargetFrameworkMoniker").Value.ToString();

Src/BridgeVs.VsPackage/LINQBridgeExtension.cs renamed to Src/BridgeVs.AsyncVsPackage/BridgeVsExtension.cs

@@ -41,6 +41,8 @@ public static string GetMsBuildVersion(string vsVersion)
                     return "v14.0";
                 case "15.0":
                     return "v15.0";
+                case "16.0":
+                    return "v16.0";
                 default :
                     throw new ArgumentException("Visual Studio Version not Supported", nameof(vsVersion));
             }

Src/BridgeVs.VsPackage.Helper/Command/BridgeCommand.cs renamed to Src/BridgeVs.AsyncVsPackage/Command/BridgeCommand.cs

@@ -32,6 +32,7 @@
 using System.Security.Principal;
 using System.Windows.Forms;
 using BridgeVs.Shared.Common;
+using BridgeVs.VisualStudio.AsyncExtension.Configuration;
 using Microsoft.Win32;
 using OpenFileDialog = System.Windows.Forms.OpenFileDialog;
 
@@ -121,20 +122,6 @@ private static bool IsLINQPadInstalled(string vsVersion)
             return false;
         }
 
-        private static void DeployMsBuildTargets(string vsVersion, string vsEdition)
-        {
-            string msBuildDir = CreateMsBuildTargetDirectory(vsVersion, vsEdition);
-            //Copy the CustomAfter and CustomBefore to the default MSBuild v4.0 location
-            File.Copy(CommonFolderPaths.CustomAfterTargetFileNamePath, Path.Combine(msBuildDir, CommonFolderPaths.CustomAfterTargetFileName), true);
-
-            string customBeforeTarget = Path.Combine(msBuildDir, CommonFolderPaths.CustomBeforeTargetFileName);
-            if (File.Exists(customBeforeTarget)) //old before target, now obsolete
-            {
-                File.Delete(customBeforeTarget);
-            }
-               
-        }
-
         private static void SetInstallationFolder(string vsVersion)
         {
             //Set in the registry the installer location if it is has changed
@@ -151,7 +138,7 @@ private static void SetInstallationFolder(string vsVersion)
             }
         }
 
-        private static string GetInstallationFolder(string vsVersion)
+        public static string GetInstallationFolder(string vsVersion)
         {
             //Set in the registry the installer location if it is has changed
             using (RegistryKey key = Registry.CurrentUser.OpenSubKey(CommonRegistryConfigurations.GetRegistryKey(Resources.ProductRegistryKey, vsVersion)))
@@ -235,8 +222,6 @@ public static bool Install(string vsVersion, string vsEdition)
             //Always check if installation folder has changed
             SetInstallationFolder(vsVersion);
 
-            DeployMsBuildTargets(vsVersion, vsEdition);
-
             GenerateGuidForCurrentInstallation(vsVersion);
 
             DeleteExistingVisualizers(vsVersion);
@@ -314,6 +299,10 @@ private static string DebuggerVisualizerTargetFolder(string vsVersion)
                 case "15.0":
                     debuggerVisualizerTargetFolder = CommonFolderPaths.Vs2017DebuggerVisualizerDestinationFolder;
                     break;
+                case "16.0":
+                    debuggerVisualizerTargetFolder = CommonFolderPaths.Vs2019DebuggerVisualizerDestinationFolder;
+                    break;
+
             }
 
             return debuggerVisualizerTargetFolder;

Src/BridgeVs.VsPackage.Helper/Configuration/MsBuildVersionHelper.cs renamed to Src/BridgeVs.AsyncVsPackage/Configuration/MsBuildVersionHelper.cs

@@ -25,7 +25,7 @@
 
 using System;
 
-namespace BridgeVs.VsPackage
+namespace BridgeVs.VisualStudio.AsyncExtension
 {
     public static class GuidList
     {