code cleanup

Author: codingadventures

Src/BridgeVs.AsyncVsPackage/BridgeVs.VisualStudio.AsyncExtension.csproj

@@ -35,7 +35,7 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>BridgeVs.VisualStudio.AsyncExtension</RootNamespace>
     <AssemblyName>BridgeVs.VisualStudio.AsyncExtension</AssemblyName>
-    <TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.7.1</TargetFrameworkVersion>
     <GeneratePkgDefFile>true</GeneratePkgDefFile>
     <IncludeAssemblyInVSIXContainer>true</IncludeAssemblyInVSIXContainer>
     <IncludeDebugSymbolsInVSIXContainer>true</IncludeDebugSymbolsInVSIXContainer>
@@ -283,6 +283,12 @@
     </EmbeddedResource>
   </ItemGroup>
   <ItemGroup>
+    <ProjectReference Include="..\..\Lib\SharpRaven\src\app\SharpRaven\SharpRaven.csproj">
+      <Project>{31fe81f8-6e49-432c-b0b2-658e76f96983}</Project>
+      <Name>SharpRaven</Name>
+      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
+      <AdditionalProperties>TargetFramework=net40</AdditionalProperties>
+    </ProjectReference>
     <ProjectReference Include="..\BridgeVs.Build\BridgeVs.Build.csproj">
       <Project>{276f3935-e0ca-450f-a55f-aed56dc2024e}</Project>
       <Name>BridgeVs.Build</Name>

Src/BridgeVs.AsyncVsPackage/BridgeVsExtension.cs

@@ -28,7 +28,6 @@
 using System.ComponentModel.Design;
 using System.IO;
 using System.Linq;
-using BridgeVs.Shared.Common;
 using BridgeVs.VsPackage.Helper;
 using BridgeVs.VsPackage.Helper.Command;
 using BridgeVs.VsPackage.Helper.Configuration;
@@ -56,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>();
@@ -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.AsyncVsPackage/Command/BridgeCommand.cs

@@ -76,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;

Src/BridgeVs.AsyncVsPackage/app.config

@@ -12,4 +12,4 @@
       </dependentAssembly>
     </assemblyBinding>
   </runtime>
-<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.1"/></startup></configuration>
+<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.7.1"/></startup></configuration>

Src/BridgeVs.Build/BridgeVs.Build.csproj

@@ -10,20 +10,23 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>BridgeVs.Build</RootNamespace>
     <AssemblyName>BridgeVs.Build</AssemblyName>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\</SolutionDir>
     <RestorePackages>true</RestorePackages>
+    <TargetFrameworkProfile />
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|AnyCPU'">
     <OutputPath>bin\Debug\</OutputPath>
     <DefineConstants>TRACE;DEBUG</DefineConstants>
+    <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Test|AnyCPU'">
     <OutputPath>bin\Test\</OutputPath>
     <DefineConstants>TRACE;DEBUG;TEST</DefineConstants>
     <DebugType>full</DebugType>
     <DebugSymbols>true</DebugSymbols>
+    <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Deploy|AnyCPU'">
     <OutputPath>bin\Deploy\</OutputPath>
@@ -32,12 +35,13 @@
     <Optimize>true</Optimize>
     <DebugType>pdbonly</DebugType>
     <DebugSymbols>true</DebugSymbols>
+    <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
   <PropertyGroup>
     <SignAssembly>true</SignAssembly>
   </PropertyGroup>
   <PropertyGroup>
-    <AssemblyOriginatorKeyFile>..\BridgeVs.VsPackage\Key.snk</AssemblyOriginatorKeyFile>
+    <AssemblyOriginatorKeyFile>..\BridgeVs.AsyncVsPackage\Key.snk</AssemblyOriginatorKeyFile>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="SInjection.cs" />
@@ -54,6 +58,7 @@
   <ItemGroup>
     <ProjectReference Include="..\..\Lib\SharpRaven\src\app\SharpRaven\SharpRaven.csproj">
       <Project>{31fe81f8-6e49-432c-b0b2-658e76f96983}</Project>
+      <AdditionalProperties>TargetFramework=net40</AdditionalProperties>
       <Name>SharpRaven</Name>
     </ProjectReference>
     <ProjectReference Include="..\BridgeVs.DynamicVisualizers\BridgeVs.DynamicVisualizers.csproj">

Src/BridgeVs.Build/Tasks/CleanBuildTask.cs

@@ -51,12 +51,7 @@ public class CleanBuildTask : ITask
         public bool Execute()
         {
             Log.VisualStudioVersion = VisualStudioVer;
-
-            if (!CommonRegistryConfigurations.IsSolutionEnabled(SolutionName, VisualStudioVer))
-            {
-                return true;
-            }
-
+             
             try
             {
                 string visualizerAssemblyName = VisualizerAssemblyNameFormat.GetTargetVisualizerAssemblyName(VisualStudioVer, Assembly);

Src/BridgeVs.Build/Tasks/MapperBuildTask.cs

@@ -81,27 +81,16 @@ public bool Execute()
         {
             Log.VisualStudioVersion = VisualStudioVer;
 
-            if (!CommonRegistryConfigurations.IsSolutionEnabled(SolutionName, VisualStudioVer))
-            {
-                return true;
-            }
-
             Log.Write($"Visualizer Destination Folder Path {VisualizerDestinationFolder}");
 
-
             Create3RdPartyVisualizers();
 
-            //if dot net visualizer exists already don't create it again
-            if (!FS.FileSystem.File.Exists(Path.Combine(VisualizerDestinationFolder, DotNetVisualizerAssemblyName)))
-            {
-                //it creates a mapping for all of the .net types that are worth exporting
-                CreateDotNetFrameworkVisualizer();
-            }
+            //it creates a mapping for all of the .net types that are worth exporting
+            CreateDotNetFrameworkVisualizer();
 
             CreateDebuggerVisualizer();
 
             return true;
-
         }
 
         private void Create3RdPartyVisualizers()
@@ -183,6 +172,12 @@ private void CreateDebuggerVisualizer()
 
         private void CreateDotNetFrameworkVisualizer()
         {
+
+            //if dot net visualizer exists already don't create it again
+            if (FS.FileSystem.File.Exists(Path.Combine(VisualizerDestinationFolder, DotNetVisualizerAssemblyName)))
+            {
+                return;
+            }
             try
             {
                 //this is where the current assembly being built is saved

Src/BridgeVs.Build/Tasks/SInjectionBuildTask.cs

@@ -48,12 +48,7 @@ public class SInjectionBuildTask : ITask
         public bool Execute()
         {
             Log.VisualStudioVersion = VisualStudioVer;
-
-            if (!CommonRegistryConfigurations.IsSolutionEnabled(SolutionName, VisualStudioVer))
-            {
-                return true;
-            }
-
+            
             try
             {
                 string snkCertificate = File.Exists(Snk) ? Snk : null;

Src/BridgeVs.Build/app.config

@@ -1,17 +1,17 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <configuration>
   <runtime>
 
     <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
 
         <dependentAssembly>
 
-            <assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" />
+            <assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral"/>
 
-            <bindingRedirect oldVersion="0.0.0.0-11.0.0.0" newVersion="11.0.0.0" />
+            <bindingRedirect oldVersion="0.0.0.0-11.0.0.0" newVersion="11.0.0.0"/>
 
         </dependentAssembly>
 
     </assemblyBinding>
   </runtime>
-</configuration>
+<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5"/></startup></configuration>

Src/BridgeVs.Build/packages.config

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
   <package id="Mono.Cecil" version="0.10.0" targetFramework="net40" />
-  <package id="Newtonsoft.Json" version="11.0.2" targetFramework="net40" />
+  <package id="Newtonsoft.Json" version="11.0.2" targetFramework="net40" requireReinstallation="true" />
   <package id="System.IO.Abstractions" version="2.1.0.256" targetFramework="net40" />
 </packages>