Merge branch 'develop' of https://github.com/chaowlert/ExpressionDebugger

Author: chaowlert

ExpressionDebugger/DebugInfoInjector.cs

@@ -26,7 +26,7 @@ public class DebugInfoInjector : ExpressionVisitor, IDisposable
         private Dictionary<object, int> _ids;
         private Dictionary<ParameterExpression, ParameterExpression> _params;
         private TextWriter _appendWriter;
-        private HashSet<LambdaExpression> _visitedLambda; 
+        private HashSet<LambdaExpression> _visitedLambda;
 
         public DebugInfoInjector(string filename)
         {
@@ -41,7 +41,7 @@ public DebugInfoInjector(TextWriter writer)
             _writer = writer;
         }
 
-        public Expression Inject(Expression node)
+        public virtual Expression Inject(Expression node)
         {
             var lambda = node as LambdaExpression;
             var result = node.NodeType == ExpressionType.Lambda 
@@ -1497,17 +1497,8 @@ public Delegate Compile(LambdaExpression node, AssemblyName an = null)
             {
                 if (an == null)
                 {
-                    StrongNameKeyPair kp;
-                    // Getting this from a resource would be a good idea.
-                    using (var stream = Assembly.GetExecutingAssembly().GetManifestResourceStream("ExpressionDebugger.mock.keys"))
-                    using (var mem = new MemoryStream())
-                    {
-                        stream.CopyTo(mem);
-                        mem.Position = 0;
-                        kp = new StrongNameKeyPair(mem.ToArray());
-                    }
                     var name = "ExpressionDebugger.Dynamic";
-                    an = new AssemblyName(name) { KeyPair = kp };
+                    an = new AssemblyName(name);
                 }
 
                 var asm = AppDomain.CurrentDomain.DefineDynamicAssembly(an, AssemblyBuilderAccess.Run);

ExpressionDebugger/ExpressionDebugger.csproj

@@ -8,11 +8,13 @@
     <PackageProjectUrl>https://github.com/chaowlert/ExpressionDebugger</PackageProjectUrl>
     <RepositoryUrl>https://github.com/chaowlert/ExpressionDebugger</RepositoryUrl>
     <PackageTags>expression;linq;debug</PackageTags>
-    <PackageIconUrl>http://www.fancyicons.com/free-icons/112/must-have/png/128/pause_128.png</PackageIconUrl>
+    <PackageIconUrl>https://cloud.githubusercontent.com/assets/5763993/26522656/41e28a6e-432f-11e7-9cae-7856f927d1a1.png</PackageIconUrl>
     <SignAssembly>True</SignAssembly>
     <PublicSign Condition=" '$(OS)' != 'Windows_NT' ">true</PublicSign>
     <AssemblyOriginatorKeyFile>ExpressionDebugger.snk</AssemblyOriginatorKeyFile>
-    <Version>1.0.2</Version>
+    <Version>1.0.5</Version>
+    <FileVersion>1.0.5.0</FileVersion>
+    <AssemblyVersion>1.0.5.0</AssemblyVersion>
   </PropertyGroup>
 
   <ItemGroup Condition=" '$(TargetFramework)' == 'net40' ">
@@ -27,8 +29,4 @@
     <PackageReference Include="System.Reflection.TypeExtensions" Version="4.3.0" />
   </ItemGroup>
 
-  <ItemGroup>
-    <EmbeddedResource Include="mock.keys" />
-  </ItemGroup>
-
 </Project>