Fixed RazorEngine and FluentEmail to use the System.Web.Razor RC from…

… MVC4
lukencode · Jun 22, 2012 · f915209 · f915209
1 parent 6a81a3b
commit f915209
Show file tree

Hide file tree

Showing 7 changed files with 15 additions and 6 deletions.
diff --git a/FluentEmail/FluentEmail.csproj b/FluentEmail/FluentEmail.csproj
@@ -36,15 +36,16 @@
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="Microsoft.CSharp" />
-    <Reference Include="RazorEngine">
-      <HintPath>..\packages\RazorEngine.3.0.8\lib\net40\RazorEngine.dll</HintPath>
+    <Reference Include="RazorEngine, Version=3.0.8.0, Culture=neutral, PublicKeyToken=9ee697374c7e744a, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\lib\RazorEngine.dll</HintPath>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core" />
     <Reference Include="System.Data" />
-    <Reference Include="System.Web.Razor, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+    <Reference Include="System.Web.Razor, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
       <Private>True</Private>
-      <HintPath>..\packages\RazorEngine.3.0.8\lib\net40\System.Web.Razor.dll</HintPath>
+      <HintPath>..\packages\Microsoft.AspNet.Razor.2.0.20505.0\lib\net40\System.Web.Razor.dll</HintPath>
     </Reference>
   </ItemGroup>
   <ItemGroup>

diff --git a/FluentEmail/packages.config b/FluentEmail/packages.config
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="RazorEngine" version="3.0.8" />
+  <package id="Microsoft.AspNet.Razor" version="2.0.20505.0" targetFramework="net40" />
 </packages>
diff --git a/FluentEmailTests/App.config b/FluentEmailTests/App.config
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" ?>
+<?xml version="1.0" encoding="utf-8"?>
 <configuration>
   <system.net>
     <mailSettings>
@@ -7,4 +7,12 @@
       </smtp>
     </mailSettings>
   </system.net>
+  <runtime>
+    <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
+      <dependentAssembly>
+        <assemblyIdentity name="System.Web.Razor" publicKeyToken="31bf3856ad364e35" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-2.0.0.0" newVersion="2.0.0.0" />
+      </dependentAssembly>
+    </assemblyBinding>
+  </runtime>
 </configuration>
diff --git a/lib/RazorEngine.dll b/lib/RazorEngine.dll
diff --git a/packages/RazorEngine.3.0.8/RazorEngine.3.0.8.nupkg b/packages/RazorEngine.3.0.8/RazorEngine.3.0.8.nupkg
diff --git a/packages/RazorEngine.3.0.8/lib/net40/RazorEngine.dll b/packages/RazorEngine.3.0.8/lib/net40/RazorEngine.dll
diff --git a/packages/RazorEngine.3.0.8/lib/net40/System.Web.Razor.dll b/packages/RazorEngine.3.0.8/lib/net40/System.Web.Razor.dll