Merge pull request #40 from codingadventures/SentryIntegration

Massive refactoring #39

Author: codingadventures

Src/SInject/Logo/SInject.png Docs/SInject.pngSrc/SInject/Logo/SInject.png renamed to Docs/SInject.png

@@ -21,7 +21,7 @@
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Test|AnyCPU'">
     <OutputPath>bin\Test\</OutputPath>
-    <DefineConstants>TRACE;DEBUG</DefineConstants>
+    <DefineConstants>TRACE;DEBUG;TEST</DefineConstants>
     <DebugType>full</DebugType>
     <DebugSymbols>true</DebugSymbols>
   </PropertyGroup>
@@ -31,58 +31,38 @@
     <PlatformTarget>AnyCPU</PlatformTarget>
     <Optimize>true</Optimize>
   </PropertyGroup>
-  <PropertyGroup>
-    <SignAssembly>false</SignAssembly>
-  </PropertyGroup>
-  <PropertyGroup>
-    <AssemblyOriginatorKeyFile>..\LinqBridgeVsExtension\Key.snk</AssemblyOriginatorKeyFile>
-  </PropertyGroup>
   <ItemGroup>
+    <Compile Include="Dependency\Crawler.cs" />
+    <Compile Include="Dependency\ProjectDependency.cs" />
+    <Compile Include="SInjection.cs" />
     <Compile Include="Tasks\CleanBuildTask.cs" />
     <Compile Include="Tasks\MapperBuildTask.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="Tasks\SInjectionBuildTask.cs" />
     <Compile Include="TypeMapper\VisualizerAttributeInjector.cs" />
     <Compile Include="Util\EnumerableExtension.cs" />
+    <Compile Include="Util\ReflectionUtils.cs" />
+    <Compile Include="Util\TypeReferenceExt.cs" />
     <Compile Include="Util\VisualizerAssemblyNameFormat.cs" />
-    <Compile Include="VisualStudioOptions.cs" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\BridgeVs.Locations\BridgeVs.Locations.csproj">
       <Project>{bc10f93a-5da2-44f8-ae5e-5603cb46b548}</Project>
       <Name>BridgeVs.Locations</Name>
     </ProjectReference>
-    <ProjectReference Include="..\Logging\BridgeVs.Logging.csproj">
+    <ProjectReference Include="..\BridgeVs.DynamicVisualizers\BridgeVs.DynamicVisualizers.csproj">
+      <Project>{b84fbd50-0b10-4c25-8430-680fc6fc3fea}</Project>
+      <Name>BridgeVs.DynamicVisualizers</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\BridgeVs.Logging\BridgeVs.Logging.csproj">
       <Project>{0b546762-c8c0-45c6-bc42-c5d91d510351}</Project>
       <Name>BridgeVs.Logging</Name>
     </ProjectReference>
-    <ProjectReference Include="..\SInject\BridgeVs.SInject.csproj">
-      <Project>{cd851c2d-8b24-4d72-b2a1-149f7d27c2f1}</Project>
-      <Name>BridgeVs.SInject</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\DynamicVisualizer.V11\BridgeVs.DynamicVisualizer.V11.csproj">
-      <Project>{c6798d16-89f5-4bff-8b62-2be6d4bbc192}</Project>
-      <Name>BridgeVs.DynamicVisualizer.V11</Name>
-      <Private>False</Private>
-    </ProjectReference>
-    <ProjectReference Include="..\DynamicVisualizer.V12\BridgeVs.DynamicVisualizer.V12.csproj">
-      <Project>{835064f0-3c4f-4646-b17a-632c192cce3b}</Project>
-      <Name>BridgeVs.DynamicVisualizer.V12</Name>
-      <Private>False</Private>
-    </ProjectReference>
-    <ProjectReference Include="..\DynamicVisualizer.V14\BridgeVs.DynamicVisualizer.V14.csproj">
-      <Project>{0beb30c9-243b-4192-8633-423b9322c587}</Project>
-      <Name>BridgeVs.DynamicVisualizer.V14</Name>
-      <Private>False</Private>
-    </ProjectReference>
-    <ProjectReference Include="..\DynamicVisualizer.V15\BridgeVs.DynamicVisualizer.V15.csproj">
-      <Project>{6278c369-9593-4e93-a725-010717e7fc10}</Project>
-      <Name>BridgeVs.DynamicVisualizer.V15</Name>
-      <Private>False</Private>
-    </ProjectReference>
   </ItemGroup>
   <ItemGroup>
+    <Reference Include="Microsoft.Build" />
     <Reference Include="Microsoft.Build.Framework" />
+    <Reference Include="Microsoft.CSharp" />
     <Reference Include="Mono.Cecil, Version=0.10.0.0, Culture=neutral, PublicKeyToken=50cebf1cceb9d05e, processorArchitecture=MSIL">
       <HintPath>..\packages\Mono.Cecil.0.10.0\lib\net40\Mono.Cecil.dll</HintPath>
     </Reference>
@@ -93,11 +73,22 @@
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\packages\Mono.Cecil.0.10.0\lib\net40\Mono.Cecil.Rocks.dll</HintPath>
     </Reference>
+    <Reference Include="Newtonsoft.Json, Version=11.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
+      <HintPath>..\packages\Newtonsoft.Json.11.0.1\lib\net40\Newtonsoft.Json.dll</HintPath>
+    </Reference>
+    <Reference Include="SharpRaven, Version=2.3.2.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\SharpRaven.2.3.2\lib\net40\SharpRaven.dll</HintPath>
+    </Reference>
     <Reference Include="System" />
+    <Reference Include="System.Configuration" />
     <Reference Include="System.Core" />
+    <Reference Include="System.XML" />
+    <Reference Include="System.Xml.Linq" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="app.config" />
+    <None Include="app.config">
+      <SubType>Designer</SubType>
+    </None>
     <None Include="packages.config">
       <SubType>Designer</SubType>
     </None>

Lib/VS2015/Microsoft.VisualStudio.DebuggerVisualizers.dll

@@ -33,9 +33,9 @@
 using BridgeVs.Logging;
 using Microsoft.Build.Evaluation;
 
-namespace BridgeVs.Helper.Dependency
+namespace BridgeVs.Build.Dependency
 {
-    public class Crawler
+    internal class Crawler
     {
         private const string MsbuildNamespace = "http://schemas.microsoft.com/developer/msbuild/2003";
         /// <summary>
@@ -44,12 +44,12 @@ public class Crawler
         /// <param name="csvbProjectName">Name of the CS or VB project.</param>
         /// <param name="solutionName">Name of the solution.</param>
         /// <returns></returns>
-        public static IEnumerable<Dependency> FindDependencies(string csvbProjectName, string solutionName)
+        internal static IEnumerable<ProjectDependency> FindDependencies(string csvbProjectName, string solutionName)
         {
             if (string.IsNullOrEmpty(csvbProjectName))
             {
-                Log.Write("BridgeVs.Helper.Dependency.Crawler: csvbProjectName is null or empty");
-                return Enumerable.Empty<Dependency>();
+                Log.Write("BridgeVs.VsPackage.Helper.Dependency.Crawler: csvbProjectName is null or empty");
+                return Enumerable.Empty<ProjectDependency>();
             }
 
             XmlNamespaceManager namespaceManager = new XmlNamespaceManager(new NameTable());
@@ -73,7 +73,7 @@ where proj.ItemType.Equals("ProjectReference")
                 let assemblyName = referenceProjectXDocument.XPathSelectElement("/aw:Project/aw:PropertyGroup/aw:AssemblyName", namespaceManager)?.Value
                 let outputType = referenceProjectXDocument.XPathSelectElement("/aw:Project/aw:PropertyGroup/aw:OutputType", namespaceManager)?.Value
                 let outputPath = referenceProjectXDocument.XPathSelectElement("/aw:Project/aw:PropertyGroup/aw:OutputPath", namespaceManager)?.Value
-                select new Dependency
+                select new ProjectDependency
                 {
                     DependencyType =
                         proj.ItemType.Equals("Reference") ? DependencyType.AssemblyReference : DependencyType.ProjectReference,

Src/Build/BridgeVs.Build.csproj Src/BridgeVs.Build/BridgeVs.Build.csprojSrc/Build/BridgeVs.Build.csproj renamed to Src/BridgeVs.Build/BridgeVs.Build.csproj

@@ -1,5 +1,5 @@
 #region License
-// Copyright (c) 2013 Coding Adventures
+// Copyright (c) 2013 - 2018 Coding Adventures
 //
 // Permission is hereby granted, free of charge, to any person
 // obtaining a copy of this software and associated documentation
@@ -23,31 +23,24 @@
 // OTHER DEALINGS IN THE SOFTWARE.
 #endregion
 
-using System;
-
-namespace BridgeVs.Helper.Dependency
+namespace BridgeVs.Build.Dependency
 {
-    [Serializable]
-    public enum DependencyType
-    {
-        ProjectReference,
-        AssemblyReference
-    }
-
-    [Serializable]
-    public class Dependency
+    internal class ProjectDependency
     {
         public DependencyType DependencyType { get; set; }
-
         public string AssemblyName { get; set; }
-
         public string AssemblyPath { get; set; }
-
         public string SolutionName { get; set; }
 
         public override string ToString()
         {
             return $"{DependencyType} {AssemblyName} {AssemblyPath}";
         }
     }
-}
+
+    internal enum DependencyType
+    {
+        AssemblyReference,
+        ProjectReference
+    }
+}

…VsExtension.Helper/Dependency/Crawler.cs Src/BridgeVs.Build/Dependency/Crawler.csSrc/VsExtension.Helper/Dependency/Crawler.cs renamed to Src/BridgeVs.Build/Dependency/Crawler.cs Src/VsExtension.Helper/Dependency/Crawler.cs renamed to Src/BridgeVs.Build/Dependency/Crawler.cs

@@ -60,7 +60,9 @@
 // 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: InternalsVisibleTo("BridgeVs.Build.IntegrationTest")]
+#if TEST
+[assembly: InternalsVisibleTo("BridgeVs.Build.Test")]
+#endif
 
-[assembly: AssemblyVersion("1.0.*")]
+[assembly: AssemblyVersion("1.4.*")]
 [assembly: AssemblyFileVersion("1.0.0.0")]

…xtension.Helper/Dependency/Dependency.cs …Vs.Build/Dependency/ProjectDependency.csSrc/VsExtension.Helper/Dependency/Dependency.cs renamed to Src/BridgeVs.Build/Dependency/ProjectDependency.cs Src/VsExtension.Helper/Dependency/Dependency.cs renamed to Src/BridgeVs.Build/Dependency/ProjectDependency.cs

@@ -30,12 +30,12 @@
 using System.Linq;
 using System.Reflection;
 using System.Threading;
+using BridgeVs.Build.Util;
 using BridgeVs.Logging;
 using Mono.Cecil;
 using Mono.Cecil.Pdb;
-using BridgeVs.SInject.Reflection;
 
-namespace BridgeVs.SInject
+namespace BridgeVs.Build
 {
     /// <summary>
     /// Type of serialization to enable
@@ -68,19 +68,17 @@ public enum PatchMode
         Release
     }
 
-
     /// <summary>
     /// This class inject the Serializable Attribute to all public class types in a given assembly, and adds
     /// default deserialization constructor for those type which implement ISerializable interface
     /// </summary>
-    public class SInjection
+    internal class SInjection
     {
         #region [ Private Properties ]
         private readonly string _assemblyLocation;
         private readonly PatchMode _mode;
         private readonly AssemblyDefinition _assemblyDefinition;
-        private static readonly Func<string, bool> IsSystemAssembly =
-        name => name.Contains("Microsoft") || name.Contains("System") || name.Contains("mscorlib");
+        private static readonly Func<string, bool> IsSystemAssembly = name => name.Contains("Microsoft") || name.Contains("System") || name.Contains("mscorlib");
 
         private const string Marker = "SInjected";
         private readonly string _snkCertificatePath;
@@ -164,8 +162,8 @@ public bool Patch(SerializationTypes types)
             AddSinjectionAttribute();
 
             bool success = WriteAssembly();
-            Log.Write(success 
-                    ? "Assembly {0} has been correctly Injected" 
+            Log.Write(success
+                    ? "Assembly {0} has been correctly Injected"
                     : "Assembly {0} was not correctly Injected",
                 _assemblyDefinition.FullName);
             return success;
@@ -290,19 +288,13 @@ private ReaderParameters GetReaderParameters()
             ReaderParameters readerParameters = new ReaderParameters
             {
                 AssemblyResolver = assemblyResolver,
-#if DEBUG
+#if TEST
                 InMemory = true,
 #endif
                 ReadingMode = ReadingMode.Immediate
             };
-
-            if (!File.Exists(PdbName))
-                return readerParameters;
-
-            PdbReaderProvider symbolReaderProvider = new PdbReaderProvider();
-            readerParameters.SymbolReaderProvider = symbolReaderProvider;
-
             return readerParameters;
+            //disables reading the symbols...
         }
 
         private WriterParameters GetWriterParameters()

Src/Build/Properties/AssemblyInfo.cs …ridgeVs.Build/Properties/AssemblyInfo.csSrc/Build/Properties/AssemblyInfo.cs renamed to Src/BridgeVs.Build/Properties/AssemblyInfo.cs Src/Build/Properties/AssemblyInfo.cs renamed to Src/BridgeVs.Build/Properties/AssemblyInfo.cs

@@ -25,6 +25,8 @@
 
 using System.IO;
 using BridgeVs.Build.Util;
+using BridgeVs.Locations;
+using BridgeVs.Logging;
 using Microsoft.Build.Framework;
 
 namespace BridgeVs.Build.Tasks
@@ -33,18 +35,29 @@ public class CleanBuildTask : ITask
     {
         public bool Execute()
         {
-            string visualizerAssemblyName = VisualizerAssemblyNameFormat.GetTargetVisualizerAssemblyName(VisualStudioVer, Assembly);
-            string targetInstallationPath = VisualStudioOptions.GetVisualizerDestinationFolder(VisualStudioVer);
+            try
+            {
+                string visualizerAssemblyName = VisualizerAssemblyNameFormat.GetTargetVisualizerAssemblyName(VisualStudioVer, Assembly);
+                string targetInstallationPath = VisualStudioOptions.GetVisualizerDestinationFolder(VisualStudioVer);
 
-            string visualizerFullPath = Path.Combine(targetInstallationPath, visualizerAssemblyName);
+                string visualizerFullPath = Path.Combine(targetInstallationPath, visualizerAssemblyName);
 
-            if (File.Exists(visualizerFullPath))
-                File.Delete(visualizerFullPath);
+                if (File.Exists(visualizerFullPath))
+                    File.Delete(visualizerFullPath);
 
-            //check if pdb also exists and delete it
-            string visualizerPdbFullPath = visualizerFullPath.Replace(".dll",".pdb");
-            if (File.Exists(visualizerPdbFullPath))
-                File.Delete(visualizerPdbFullPath);
+                //check if pdb also exists and delete it
+                string visualizerPdbFullPath = Path.ChangeExtension(visualizerFullPath , "pdb");
+
+                if (File.Exists(visualizerPdbFullPath))
+                    File.Delete(visualizerPdbFullPath);
+            }
+            catch (System.Exception exception)
+            {
+                if (CommonRegistryConfigurations.IsErrorTrackingEnabled(VisualStudioVer))
+                    RavenWrapper.Instance.Capture(exception, message: "Error during project cleaning", vsVersion: VisualStudioVer);
+
+                return false;
+            }
 
             return true;
         }