tries to fix unit tests in appveyor

codingadventures · codingadventures · commit 45a7208f0751 · 2018-03-31T16:07:43.000+01:00
fixes some grammar mistakes in the readme
cleanups code
diff --git a/README.md b/README.md
@@ -7,7 +7,7 @@
 [![](https://img.shields.io/github/downloads/codingadventures/LINQBridgeVs/total.svg)](https://github.com/codingadventures/LINQBridgeVs/releases)
 
 LINQBridgeVs is a Visual Studio Extension compatible with Visual Studio 2012/2013/2015/2017.
-It is a bridge between a Visual Studio debugging session and [LINQPad](http://www.linqpad.net). It creates at compile time, a Custom Debugger Visualizer making the magnifier glass available for all of the public classes and structs. By clicking on the magnifier glass on an object instance, this will be transmitted over a
+It is a bridge between a Visual Studio debugging session and [LINQPad](http://www.linqpad.net). It creates, at compile time, a Custom Debugger Visualizer making the magnifier glass available for all of the public classes and structs. By clicking on the magnifier glass on an object instance, this will be transmitted over a
 bus and 'Dumped' out by LINQPad.
 <br><br>
 ## Getting Started
@@ -49,7 +49,7 @@ Only for the first time, Visual Studio must be run with Administrator privileges
 
 Once Visual Studio is restarted as Administrator, the configuration will complete and the form will never appear again. 
 
-During this process two custom MsBuild Targets, [Custom.After.Microsoft.Common.targets](https://github.com/codingadventures/LINQBridgeVs/blob/master/Src/VsExtension/Targets/Custom.After.Microsoft.Common.targets) and [Custom.Before.Microsoft.Common.targets](https://github.com/codingadventures/LINQBridgeVs/blob/master/Src/VsExtension/Targets/Custom.Before.Microsoft.Common.targets), are needed to extend the MsBuild process. They are copied into specific Visual Studio version and edition's folder:
+During this process two custom MsBuild Targets, [Custom.After.Microsoft.Common.targets](https://github.com/codingadventures/LINQBridgeVs/blob/master/Src/VsExtension/Targets/Custom.After.Microsoft.Common.targets) and [Custom.Before.Microsoft.Common.targets](https://github.com/codingadventures/LINQBridgeVs/blob/master/Src/VsExtension/Targets/Custom.Before.Microsoft.Common.targets), are needed to extend the MsBuild process. They are copied into a specific Visual Studio version and edition's folder:
 * Visual Studio 2017 - C:\Program Files (x86)\Microsoft Visual Studio\2017\{Edition}\MSBuild\v15.0
 * Visual Studio 2015 - C:\Program Files (x86)\MSBuild\v14.0
 * Visual Studio 2013 - C:\Program Files (x86)\MSBuild\v12.0
@@ -82,7 +82,7 @@ When a solution is *Bridged*, every project in is essentially flagged. Configura
 
 * **Mapper Task** - This task creates a Custom Debugger Visualizer assembly for each project.
 * **SInjection Task** - SInjection stands for "Serializable Injection". This task reads the built assembly and marks every public class and struct as Serializable. It also ensures that any type is serializable using the [BinaryFormatter](https://msdn.microsoft.com/en-us/library/system.runtime.serialization.formatters.binary.binaryformatter(v=vs.110).aspx).
-* **Clean Task** - This task deletes the custom visualizers assemblies generated by the Mapper task.
+* **Clean Task** - This task deletes the Custom Debugger Visualizer assemblies generated by the Mapper task.
 
 ## Architecture of a Debugger Visualizer
 
diff --git a/Src/Build/Properties/AssemblyInfo.cs b/Src/Build/Properties/AssemblyInfo.cs
@@ -1,6 +1,5 @@
-﻿
-#region License
-// Copyright (c) 2013 Coding Adventures
+﻿#region License
+// 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
@@ -37,7 +36,7 @@
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCompany("Coding Adventures")]
 [assembly: AssemblyProduct("BridgeVs.Build")]
-[assembly: AssemblyCopyright("Copyright © Coding Adventures 2013")]
+[assembly: AssemblyCopyright("Copyright © Coding Adventures 2013 - 2018")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
 
diff --git a/Src/Build/Tasks/SInjectionBuildTask.cs b/Src/Build/Tasks/SInjectionBuildTask.cs
@@ -45,7 +45,7 @@ public bool Execute()
 
             try
             {
-                var snkCertificate = File.Exists(Snk) ? Snk : null;
+                string snkCertificate = File.Exists(Snk) ? Snk : null;
                 var sInjection = new SInjection(Assembly, mode: PatchMode.Debug, snkCertificatePath: snkCertificate);
                 sInjection.Patch(SerializationTypes.BinarySerialization);
             }
diff --git a/Src/Build/TypeMapper/VisualizerAttributeInjector.cs b/Src/Build/TypeMapper/VisualizerAttributeInjector.cs
@@ -94,13 +94,13 @@ private void InitializeDebuggerAssembly()
         {
             _debuggerVisualizerAssembly.MainModule.TryGetTypeReference(SystemType, out TypeReference systemTypeReference);
 
-            var debuggerVisualizerAttributeTypeReference = _debuggerVisualizerAssembly.MainModule.GetType(SystemDiagnosticsDebuggerVisualizerAttribute, true);
+            TypeReference debuggerVisualizerAttributeTypeReference = _debuggerVisualizerAssembly.MainModule.GetType(SystemDiagnosticsDebuggerVisualizerAttribute, true);
 
-            var customDebuggerVisualizerTypeReference = _debuggerVisualizerAssembly
+            TypeDefinition customDebuggerVisualizerTypeReference = _debuggerVisualizerAssembly
                 .MainModule
                 .Types
                 .SingleOrDefault(definition => BaseTypeFilter(definition, "DialogDebuggerVisualizer"));
-            var customDebuggerVisualizerObjectSourceTypeReference = _debuggerVisualizerAssembly
+            TypeDefinition customDebuggerVisualizerObjectSourceTypeReference = _debuggerVisualizerAssembly
                 .MainModule
                 .Types
                 .SingleOrDefault(definition => BaseTypeFilter(definition, "VisualizerObjectSource"));
@@ -115,7 +115,7 @@ private void InitializeDebuggerAssembly()
             _visualizerObjectSourceCustomAttributeArgument = new CustomAttributeArgument(systemTypeReference, customDebuggerVisualizerObjectSourceTypeReference);
 
 
-            var assemblyDescriptionAttribute = _debuggerVisualizerAssembly.CustomAttributes.FirstOrDefault(p => p.AttributeType.FullName.Equals(SystemReflectionAssemblyDescriptionAttribute));
+            CustomAttribute assemblyDescriptionAttribute = _debuggerVisualizerAssembly.CustomAttributes.FirstOrDefault(p => p.AttributeType.FullName.Equals(SystemReflectionAssemblyDescriptionAttribute));
 
             if (assemblyDescriptionAttribute != null)
                 _assemblyDescriptionAttributeValue = assemblyDescriptionAttribute.ConstructorArguments[0].Value.ToString();
@@ -126,7 +126,7 @@ private void InitializeDebuggerAssembly()
 
         private void MapType(TypeReference typeReference)
         {
-            var scope = string.Empty;
+            string scope = string.Empty;
 
             switch (typeReference.Scope.MetadataScopeType)
             {
@@ -136,20 +136,20 @@ private void MapType(TypeReference typeReference)
                 case MetadataScopeType.ModuleReference:
                     break;
                 case MetadataScopeType.ModuleDefinition:
-                    var moduleDefinition = typeReference.Scope as ModuleDefinition;
+                    ModuleDefinition moduleDefinition = typeReference.Scope as ModuleDefinition;
                     if (moduleDefinition != null) scope = FromCILToTypeName(typeReference.FullName) + ", " + moduleDefinition.Assembly;
                     break;
                 default:
                     throw new Exception($"Assembly Scope Null. Check assembly {typeReference.FullName}");
             }
 
-            var customAttribute = new CustomAttribute(_debuggerVisualizerAssembly.MainModule.Import(_debuggerVisualizerAttributeCtor));
+            CustomAttribute customAttribute = new CustomAttribute(_debuggerVisualizerAssembly.MainModule.Import(_debuggerVisualizerAttributeCtor));
 
-            var targetType = new CustomAttributeArgument(_debuggerVisualizerAssembly.MainModule.TypeSystem.String, scope);
-            var descriptionType = new CustomAttributeArgument(_debuggerVisualizerAssembly.MainModule.TypeSystem.String, _assemblyDescriptionAttributeValue);
+            CustomAttributeArgument targetType = new CustomAttributeArgument(_debuggerVisualizerAssembly.MainModule.TypeSystem.String, scope);
+            CustomAttributeArgument descriptionType = new CustomAttributeArgument(_debuggerVisualizerAssembly.MainModule.TypeSystem.String, _assemblyDescriptionAttributeValue);
 
-            var targetTypeProperty = new CustomAttributeNamedArgument("TargetTypeName", targetType);
-            var descriptionTypeProperty = new CustomAttributeNamedArgument("Description", descriptionType);
+            CustomAttributeNamedArgument targetTypeProperty = new CustomAttributeNamedArgument("TargetTypeName", targetType);
+            CustomAttributeNamedArgument descriptionTypeProperty = new CustomAttributeNamedArgument("Description", descriptionType);
 
             customAttribute.ConstructorArguments.Add(_customDebuggerVisualizerAttributeArgument);
             customAttribute.ConstructorArguments.Add(_visualizerObjectSourceCustomAttributeArgument);
@@ -166,7 +166,7 @@ private void MapType(TypeReference typeReference)
         /// <param name="type">The type.</param>
         public void MapType(Type type)
         {
-            var typeReference = _debuggerVisualizerAssembly.MainModule.Import(type);
+            TypeReference typeReference = _debuggerVisualizerAssembly.MainModule.Import(type);
 
             MapType(typeReference);
         }
@@ -180,7 +180,7 @@ public void MapTypesFromAssembly(string assemblyToMapTypesFromLocation)
             if (!File.Exists(assemblyToMapTypesFromLocation))
                 throw new FileNotFoundException($"Assembly doesn't exist at location {assemblyToMapTypesFromLocation}");
 
-            var assemblyDefinition = AssemblyDefinition.ReadAssembly(assemblyToMapTypesFromLocation, GetReaderParameters(assemblyToMapTypesFromLocation));
+            AssemblyDefinition assemblyDefinition = AssemblyDefinition.ReadAssembly(assemblyToMapTypesFromLocation, GetReaderParameters(assemblyToMapTypesFromLocation));
 
             assemblyDefinition
                .MainModule
@@ -196,10 +196,10 @@ public void MapTypesFromAssembly(string assemblyToMapTypesFromLocation)
         /// <param name="references">The Assembly references</param>
         public void SaveDebuggerVisualizer(string debuggerVisualizerDst, IEnumerable<string> references = null)
         {
-            var success = false;
+            bool success = false;
             const int maxCount = 3;
-            var i = 0;
-            var fileName = Path.GetFileNameWithoutExtension(debuggerVisualizerDst);
+            int i = 0;
+            string fileName = Path.GetFileNameWithoutExtension(debuggerVisualizerDst);
 
             //I would have used a goto....can't forget my professor's quote: "Each GOTO can be superseeded by a Repeat Until...God bless Pascal!"
             while (!success && i++ < maxCount)
@@ -228,15 +228,15 @@ private static void DeployReferences(IEnumerable<string> references, string loca
         
         private static ReaderParameters GetReaderParameters(string assemblyPath)
         {
-            var assemblyResolver = new DefaultAssemblyResolver();
-            var assemblyLocation = Path.GetDirectoryName(assemblyPath);
+            DefaultAssemblyResolver assemblyResolver = new DefaultAssemblyResolver();
+            string assemblyLocation = Path.GetDirectoryName(assemblyPath);
             assemblyResolver.AddSearchDirectory(assemblyLocation);
 
-            var readerParameters = new ReaderParameters { AssemblyResolver = assemblyResolver };
+            ReaderParameters readerParameters = new ReaderParameters { AssemblyResolver = assemblyResolver };
 
-            var pdbName = Path.ChangeExtension(assemblyPath, "pdb");
+            string pdbName = Path.ChangeExtension(assemblyPath, "pdb");
             if (!File.Exists(pdbName)) return readerParameters;
-            var symbolReaderProvider = new PdbReaderProvider();
+            PdbReaderProvider symbolReaderProvider = new PdbReaderProvider();
             readerParameters.SymbolReaderProvider = symbolReaderProvider;
             readerParameters.ReadSymbols = true;
 
diff --git a/Src/Build/Util/EnumerableExtension.cs b/Src/Build/Util/EnumerableExtension.cs
@@ -34,9 +34,9 @@ public static class EnumerableExtension
         [DebuggerStepThrough]
         public static void ForEach<T>(this IEnumerable<T> @t, Action<T> action) where T : class
         {
-            foreach (var element in @t)
+            foreach (T element in @t)
             {
-                var el = element; //Avoiding enclosures
+                T el = element; //Avoiding enclosures
                 action(el);
             }
         }
diff --git a/Src/Build/Util/VisualizerAssemblyNameFormat.cs b/Src/Build/Util/VisualizerAssemblyNameFormat.cs
@@ -47,7 +47,7 @@ internal static string GetTargetVisualizerAssemblyName(string vsVersion, string
                 throw new ArgumentException(@"The passed visual studio version is not correct", nameof(vsVersion));
             }
 
-            var versionNumber = vsVersion.Split('.')[0];
+            string versionNumber = vsVersion.Split('.')[0];
             return $"{Path.GetFileNameWithoutExtension(assembly)}.Visualizer.V{versionNumber}.dll";
         }
 
diff --git a/Test/LINQBridgeVs.Test/AnotherModel.Test/Properties/AssemblyInfo.cs b/Test/LINQBridgeVs.Test/AnotherModel.Test/Properties/AssemblyInfo.cs
@@ -7,9 +7,9 @@
 [assembly: AssemblyTitle("Assembly.AnotherModel.Test")]
 [assembly: AssemblyDescription("")]
 [assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("Microsoft")]
+[assembly: AssemblyCompany("Coding Adventures")]
 [assembly: AssemblyProduct("Assembly.AnotherModel.Test")]
-[assembly: AssemblyCopyright("Copyright © Microsoft 2013")]
+[assembly: AssemblyCopyright("Copyright © Coding Adventures 2013 - 2018")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
 
diff --git a/Test/LINQBridgeVs.Test/BuildTasks.Test/BridgeVs.Build.UnitTest.csproj b/Test/LINQBridgeVs.Test/BuildTasks.Test/BridgeVs.Build.UnitTest.csproj
@@ -34,10 +34,9 @@
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="Microsoft.Build.Framework" />
-    <Reference Include="Microsoft.VisualStudio.DebuggerVisualizers, Version=11.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-      <HintPath>..\..\..\Src\packages\VSSDK.DebuggerVisualizers.11.0.4\lib\net20\Microsoft.VisualStudio.DebuggerVisualizers.dll</HintPath>
-      <Private>True</Private>
-      <Private>False</Private>
+    <Reference Include="Microsoft.VisualStudio.DebuggerVisualizers, Version=15.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\..\Lib\VS2017\Microsoft.VisualStudio.DebuggerVisualizers.dll</HintPath>
     </Reference>
     <Reference Include="Mono.Cecil, Version=0.9.6.0, Culture=neutral, PublicKeyToken=0738eb9f132ed756, processorArchitecture=MSIL">
       <HintPath>..\..\..\Src\packages\Mono.Cecil.0.9.6.4\lib\net40\Mono.Cecil.dll</HintPath>
diff --git a/Test/LINQBridgeVs.Test/BuildTasks.Test/packages.config b/Test/LINQBridgeVs.Test/BuildTasks.Test/packages.config
@@ -1,7 +1,5 @@
 ﻿<?xml version="1.0" encoding="utf-8"?>
 <packages>
   <package id="Mono.Cecil" version="0.9.6.4" targetFramework="net40" />
-  <package id="VSSDK.DebuggerVisualizers" version="11.0.4" targetFramework="net40" />
   <package id="VSSDK.DebuggerVisualizers.11" version="11.0.4" targetFramework="net40" />
-  <package id="VSSDK.IDE.11" version="11.0.4" targetFramework="net40" />
 </packages>
diff --git a/Test/LINQBridgeVs.Test/Model.Test/Properties/AssemblyInfo.cs b/Test/LINQBridgeVs.Test/Model.Test/Properties/AssemblyInfo.cs
@@ -7,9 +7,9 @@
 [assembly: AssemblyTitle("Bridge.Test.AssemblyModel")]
 [assembly: AssemblyDescription("")]
 [assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("")]
+[assembly: AssemblyCompany("Coding Adventures")]
 [assembly: AssemblyProduct("Bridge.Test.AssemblyModel")]
-[assembly: AssemblyCopyright("Copyright ©  2013")]
+[assembly: AssemblyCopyright("Copyright © Coding Adventures 2013 - 2018")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
 

Original file line number	Diff line number	Diff line change
`@@ -45,7 +45,7 @@ public bool Execute()`
`45`	`45`
`46`	`46`	`try`
`47`	`47`	`{`
`48`		`- var snkCertificate = File.Exists(Snk) ? Snk : null;`
	`48`	`+ string snkCertificate = File.Exists(Snk) ? Snk : null;`
`49`	`49`	`var sInjection = new SInjection(Assembly, mode: PatchMode.Debug, snkCertificatePath: snkCertificate);`
`50`	`50`	`sInjection.Patch(SerializationTypes.BinarySerialization);`
`51`	`51`	`}`
Original file line number	Diff line number	Diff line change
`@@ -34,9 +34,9 @@ public static class EnumerableExtension`
`34`	`34`	`[DebuggerStepThrough]`
`35`	`35`	`public static void ForEach<T>(this IEnumerable<T> @t, Action<T> action) where T : class`
`36`	`36`	`{`
`37`		`- foreach (var element in @t)`
	`37`	`+ foreach (T element in @t)`
`38`	`38`	`{`
`39`		`- var el = element; //Avoiding enclosures`
	`39`	`+ T el = element; //Avoiding enclosures`
`40`	`40`	`action(el);`
`41`	`41`	`}`
`42`	`42`	`}`
Original file line number	Diff line number	Diff line change
`@@ -47,7 +47,7 @@ internal static string GetTargetVisualizerAssemblyName(string vsVersion, string`
`47`	`47`	`throw new ArgumentException(@"The passed visual studio version is not correct", nameof(vsVersion));`
`48`	`48`	`}`
`49`	`49`
`50`		`- var versionNumber = vsVersion.Split('.')[0];`
	`50`	`+ string versionNumber = vsVersion.Split('.')[0];`
`51`	`51`	`return $"{Path.GetFileNameWithoutExtension(assembly)}.Visualizer.V{versionNumber}.dll";`
`52`	`52`	`}`
`53`	`53`