Changeset 2526

Timestamp:

3/15/2012 12:51:46 AM (14 months ago)

Author:

lowjoel

Message:

StrongNameSignatureVerificationEx? has been deprecated. For .NET 4, we need to instantiate and ICLRStrongName from the current runtime and call the interface's StrongNameSignatureVerificationEx?. This code adds a dependency on a managed library by the CLR Runtime Activation Team (​http://clractivation.codeplex.com), included in the distribution.

Location:

trunk/eraser

Files:

• Dependencies/Microsoft.Runtime.Hosting.Interop.dll (added)
• Dependencies/Microsoft.Runtime.Hosting.Interop.pdb (added)
• Dependencies/Microsoft.Runtime.Hosting.dll (added)
• Dependencies/Microsoft.Runtime.Hosting.pdb (added)
• Eraser.Util/Eraser.Util.csproj (modified) (2 diffs)
• Eraser.Util/Security.cs (modified) (2 diffs)

trunk/eraser/Eraser.Util/Eraser.Util.csproj

@@ -55 +55 @@
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="alglib, Version=2.3.0.0, Culture=neutral, PublicKeyToken=3ac89a0351e689b6, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\Dependencies\alglib.dll</HintPath>
+    <Reference Include="alglibnet2">
+      <HintPath>..\Dependencies\alglibnet2.dll</HintPath>
     </Reference>
     <Reference Include="CommonLibrary, Version=0.9.3.10, Culture=neutral, PublicKeyToken=3ac89a0351e689b6, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\Dependencies\CommonLibrary.dll</HintPath>
+    </Reference>
+    <Reference Include="Microsoft.Runtime.Hosting">
+      <HintPath>..\Dependencies\Microsoft.Runtime.Hosting.dll</HintPath>
+    </Reference>
+    <Reference Include="Microsoft.Runtime.Hosting.Interop">
+      <HintPath>..\Dependencies\Microsoft.Runtime.Hosting.Interop.dll</HintPath>
+      <EmbedInteropTypes>True</EmbedInteropTypes>
     </Reference>
     <Reference Include="System" />
@@ -85 +91 @@
     <Compile Include="Localisation.cs" />
     <Compile Include="NativeMethods\Kernel.cs" />
-    <Compile Include="NativeMethods\MsCorEE.cs" />
     <Compile Include="NativeMethods\NetApi.cs" />
     <Compile Include="NativeMethods\NtDll.cs" />

trunk/eraser/Eraser.Util/Security.cs

@@ -23 +23 @@
 using System.Collections.Generic;
 using System.Text;
+
 using System.ComponentModel;
 using System.Security.Principal;
 using System.Runtime.InteropServices;
+
 using Microsoft.Win32.SafeHandles;
+using Microsoft.Runtime.Hosting;
+using Microsoft.Runtime.Hosting.Interop;
 
 namespace Eraser.Util
@@ -88 +92 @@
         public static bool VerifyStrongName(string assemblyPath)
         {
-            bool wasVerified = false;
-            return NativeMethods.StrongNameSignatureVerificationEx(assemblyPath, false,
-                out wasVerified) && wasVerified;
+            ICLRStrongName strongName = ClrMetaHost.CurrentRuntime.GetInterface<ICLRStrongName>(
+                new Guid(0xB79B0ACD, 0xF5CD, 0x409b, 0xB5, 0xA5, 0xA1, 0x62, 0x44, 0x61, 0x0B, 0x92));
+            return strongName.StrongNameSignatureVerificationEx(assemblyPath, 1) != 0;
         }
     }