fixed a bug for vs2013 setup

Author: nbasakuragi

Src/LINQBridgeVs/LinqBridgeVsExtension/Configuration/PackageConfigurator.cs

@@ -1,9 +1,14 @@
 using System;
+using System.Collections;
 using System.Diagnostics;
 using System.IO;
+using System.Linq;
 using System.Reflection;
 using System.Text;
 using System.Windows.Forms;
+using System.Xml;
+using System.Xml.Linq;
+using System.Xml.XPath;
 using LINQBridgeVs.Logging;
 using Microsoft.Win32;
 
@@ -13,7 +18,7 @@ internal static class PackageConfigurator
     {
         private static string _vsVersion;
         private static readonly string CurrentAssemblyVersion = FileVersionInfo.GetVersionInfo(Assembly.GetExecutingAssembly().Location).FileVersion;
-        private static readonly bool IsFramework45Installed = Directory.Exists(Locations.DotNet45FrameworkPath);
+        public static readonly bool IsFramework45Installed = Directory.Exists(Locations.DotNet45FrameworkPath);
 
         private static string LINQBridgeVsExtensionVersion
         {
@@ -191,7 +196,7 @@ private static void SetPermissions()
             if (Environment.Is64BitOperatingSystem)
             {
                 var takeownProcessx64 = Process.Start("takeown",
-                    String.Format("/f {0}", Locations.MicrosoftCommonTarget64FileNamePath));
+                    String.Format("/f {0}", Locations.MicrosoftCommonTargetX64FileNamePath));
 
                 if (takeownProcessx64 != null) takeownProcessx64.WaitForExit();
             }
@@ -292,5 +297,49 @@ public static bool IsBridgeDisabled(string assemblyName)
         {
             return !IsBridgeEnabled(assemblyName);
         }
+
+
+        public static void EnableLinqBridge(XDocument document, string location)
+        {
+
+            var import = XName.Get("Import", "http://schemas.microsoft.com/developer/msbuild/2003");
+
+            if (document.Root == null || GetTargetImportNode(document) != null) return;
+
+            // ReSharper disable once AssignNullToNotNullAttribute
+            var linqBridgeTarget = new XElement(import, new XAttribute("Project", Path.GetFileName(Resources.Targets)));
+
+            document.Root.Add(linqBridgeTarget);
+
+            document.Save(location);
+        }
+
+        public static void DisableLinqBridge(XDocument document, string location)
+        {
+            var linqBridgeTargetImportNode = GetTargetImportNode(document);
+
+            if (linqBridgeTargetImportNode == null) return;
+
+            linqBridgeTargetImportNode.Remove();
+
+            document.Save(location);
+        }
+
+
+        private static XElement GetTargetImportNode(XDocument document)
+        {
+            var namespaceManager = new XmlNamespaceManager(new NameTable());
+            namespaceManager.AddNamespace("aw", "http://schemas.microsoft.com/developer/msbuild/2003");
+
+            var importProjectNode =
+                (IEnumerable)
+                    document.XPathEvaluate("/aw:Project/aw:Import[@Project='BridgeBuildTask.targets']",
+                        namespaceManager);
+
+
+            var linqBridgeTargetImportNode = importProjectNode.Cast<XElement>().FirstOrDefault();
+
+            return linqBridgeTargetImportNode;
+        }
     }
 }

Src/LINQBridgeVs/LinqBridgeVsExtension/LINQBridgePackage.cs

@@ -91,6 +91,12 @@ public sealed class LINQBridgeVsPackage : Package
         private static readonly XDocument MicrosoftCommonTargetDocument
             = XDocument.Load(Locations.MicrosoftCommonTargetFileNamePath);
 
+        private static readonly XDocument MicrosoftCommonTargetX64Document
+            = XDocument.Load(Locations.MicrosoftCommonTargetX64FileNamePath);
+
+        private static readonly XDocument MicrosoftCommonTarget45Document
+            = XDocument.Load(Locations.MicrosoftCommonTarget45FileNamePath);
+
         public DTE2 ApplicationObject
         {
             get
@@ -170,7 +176,11 @@ private void HandleVisualStudioShutDown()
                 if (Process.GetProcessesByName(VisualStudioProcessName).Length > 1) return;
 
                 Log.Write("Disabling LINQBridgeVS. Only one VS instance opened");
-                DisableLinqBridge();
+                PackageConfigurator.DisableLinqBridge(MicrosoftCommonTargetDocument, Locations.MicrosoftCommonTargetFileNamePath);
+                if (Environment.Is64BitOperatingSystem)
+                    PackageConfigurator.DisableLinqBridge(MicrosoftCommonTargetX64Document, Locations.MicrosoftCommonTargetX64FileNamePath);
+                if (PackageConfigurator.IsFramework45Installed)
+                    PackageConfigurator.DisableLinqBridge(MicrosoftCommonTarget45Document, Locations.MicrosoftCommonTarget45FileNamePath);
 
                 PackageConfigurator.IsEnvironmentConfigured = false;
             }
@@ -191,7 +201,11 @@ private void OnStartupComplete()
                 _dteEvents.OnStartupComplete -= OnStartupComplete;
                 _dteEvents = null;
 
-                EnableLinqBridge();
+                PackageConfigurator.EnableLinqBridge(MicrosoftCommonTargetDocument, Locations.MicrosoftCommonTargetFileNamePath);
+                if (Environment.Is64BitOperatingSystem)
+                    PackageConfigurator.EnableLinqBridge(MicrosoftCommonTargetX64Document, Locations.MicrosoftCommonTargetX64FileNamePath);
+                if (PackageConfigurator.IsFramework45Installed)
+                    PackageConfigurator.EnableLinqBridge(MicrosoftCommonTarget45Document, Locations.MicrosoftCommonTarget45FileNamePath);
 
                 Log.Write("OnStartupComplete End");
 
@@ -202,58 +216,9 @@ private void OnStartupComplete()
             }
         }
 
-        private static void DisableLinqBridge()
-        {
-            var linqBridgeTargetImportNode = GetTargetImportNode();
-
-            if (linqBridgeTargetImportNode == null) return;
-
-            linqBridgeTargetImportNode.Remove();
-
-            MicrosoftCommonTargetDocument.Save(Locations.MicrosoftCommonTargetFileNamePath);
-
-            if (Environment.Is64BitOperatingSystem)
-                MicrosoftCommonTargetDocument.Save(Locations.MicrosoftCommonTarget64FileNamePath);
-
-
-        }
-
-
-        private static void EnableLinqBridge()
-        {
-
-            var import = XName.Get("Import", "http://schemas.microsoft.com/developer/msbuild/2003");
+        
 
-            if (MicrosoftCommonTargetDocument.Root == null || GetTargetImportNode() != null) return;
 
-            // ReSharper disable once AssignNullToNotNullAttribute
-            var linqBridgeTarget = new XElement(import, new XAttribute("Project", Path.GetFileName(Resources.Targets)));
-
-            MicrosoftCommonTargetDocument.Root.Add(linqBridgeTarget);
-
-
-            MicrosoftCommonTargetDocument.Save(Locations.MicrosoftCommonTargetFileNamePath);
-
-            if (Environment.Is64BitOperatingSystem)
-                MicrosoftCommonTargetDocument.Save(Locations.MicrosoftCommonTarget64FileNamePath);
-        }
-
-
-        private static XElement GetTargetImportNode()
-        {
-            var namespaceManager = new XmlNamespaceManager(new NameTable());
-            namespaceManager.AddNamespace("aw", "http://schemas.microsoft.com/developer/msbuild/2003");
-
-            var importProjectNode =
-                (IEnumerable)
-                    MicrosoftCommonTargetDocument.XPathEvaluate("/aw:Project/aw:Import[@Project='BridgeBuildTask.targets']",
-                        namespaceManager);
-
-
-            var linqBridgeTargetImportNode = importProjectNode.Cast<XElement>().FirstOrDefault();
-
-            return linqBridgeTargetImportNode;
-        }
 
 
         #endregion

Src/LINQBridgeVs/LinqBridgeVsExtension/Locations.cs

@@ -55,12 +55,12 @@ public static string InstallFolder
 
         public static readonly string MicrosoftCommonTarget45FileNamePath = Path.Combine(DotNet45FrameworkPath, "Microsoft.Common.targets");
 
-        public static readonly string MicrosoftCommonTarget64FileNamePath = Path.Combine(DotNet40Framework64Path, "Microsoft.Common.targets");
+        public static readonly string MicrosoftCommonTargetX64FileNamePath = Path.Combine(DotNet40Framework64Path, "Microsoft.Common.targets");
 
         public static readonly string IcaclsArguments45 = String.Format("\"{0}\" /grant Everyone:F", DotNet45FrameworkPath);
 
         public static readonly string IcaclsArgumentsCommonTarget = String.Format("{0} /grant Everyone:F", MicrosoftCommonTargetFileNamePath);
         public static readonly string IcaclsArguments45CommonTarget = String.Format("\"{0}\" /grant Everyone:F", MicrosoftCommonTarget45FileNamePath);
-        public static readonly string IcaclsArgumentsX64CommonTarget = String.Format("{0} /grant Everyone:F", MicrosoftCommonTarget64FileNamePath);
+        public static readonly string IcaclsArgumentsX64CommonTarget = String.Format("{0} /grant Everyone:F", MicrosoftCommonTargetX64FileNamePath);
     }
 }