From 95f74dff69d90136183eaf39dca1bae3c080fe65 Mon Sep 17 00:00:00 2001
From: James Pepplinkhouse <jpepp@ebgames.com>
Date: Tue, 11 Mar 2014 13:39:52 +1000
Subject: [PATCH 1/2] Support for Razor 3 - Update RazorEngine 3.3.0 => 3.4.1 -
 Update Microsoft.AspNet.Razor 2.0.30506.0 => 3.0.0

---
 Email/Email.csproj                                 | 11 +++++------
 Email/packages.config                              |  4 ++--
 RazorSharpEmail.Tests/RazorSharpEmail.Tests.csproj | 12 ++++++------
 RazorSharpEmail.Tests/app.config                   | 11 +++++++++++
 RazorSharpEmail.Tests/packages.config              |  4 ++--
 RazorSharpEmail/RazorSharpEmail.csproj             | 11 +++++------
 RazorSharpEmail/packages.config                    |  4 ++--
 7 files changed, 33 insertions(+), 24 deletions(-)
 create mode 100644 RazorSharpEmail.Tests/app.config

diff --git a/Email/Email.csproj b/Email/Email.csproj
index d938fca..07d2371 100644
--- a/Email/Email.csproj
+++ b/Email/Email.csproj
@@ -32,15 +32,14 @@
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="RazorEngine, Version=3.3.0.0, Culture=neutral, PublicKeyToken=9ee697374c7e744a, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\packages\RazorEngine.3.3.0\lib\net40\RazorEngine.dll</HintPath>
+    <Reference Include="RazorEngine">
+      <HintPath>..\packages\RazorEngine.3.4.1\lib\net45\RazorEngine.dll</HintPath>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core" />
-    <Reference Include="System.Web.Razor, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <Private>True</Private>
-      <HintPath>..\packages\Microsoft.AspNet.Razor.2.0.30506.0\lib\net40\System.Web.Razor.dll</HintPath>
+    <Reference Include="System.Web.Razor, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\packages\Microsoft.AspNet.Razor.3.0.0\lib\net45\System.Web.Razor.dll</HintPath>
     </Reference>
     <Reference Include="System.Xml.Linq" />
     <Reference Include="System.Data.DataSetExtensions" />
diff --git a/Email/packages.config b/Email/packages.config
index f57c85d..1e86820 100644
--- a/Email/packages.config
+++ b/Email/packages.config
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="Microsoft.AspNet.Razor" version="2.0.30506.0" targetFramework="net45" />
-  <package id="RazorEngine" version="3.3.0" targetFramework="net45" />
+  <package id="Microsoft.AspNet.Razor" version="3.0.0" targetFramework="net45" />
+  <package id="RazorEngine" version="3.4.1" targetFramework="net45" />
 </packages>
\ No newline at end of file
diff --git a/RazorSharpEmail.Tests/RazorSharpEmail.Tests.csproj b/RazorSharpEmail.Tests/RazorSharpEmail.Tests.csproj
index 8764626..4b4c595 100644
--- a/RazorSharpEmail.Tests/RazorSharpEmail.Tests.csproj
+++ b/RazorSharpEmail.Tests/RazorSharpEmail.Tests.csproj
@@ -48,15 +48,14 @@
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\packages\NUnit.2.6.2\lib\nunit.framework.dll</HintPath>
     </Reference>
-    <Reference Include="RazorEngine, Version=3.3.0.0, Culture=neutral, PublicKeyToken=9ee697374c7e744a, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\packages\RazorEngine.3.3.0\lib\net40\RazorEngine.dll</HintPath>
+    <Reference Include="RazorEngine">
+      <HintPath>..\packages\RazorEngine.3.4.1\lib\net45\RazorEngine.dll</HintPath>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core" />
-    <Reference Include="System.Web.Razor, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <Private>True</Private>
-      <HintPath>..\packages\Microsoft.AspNet.Razor.2.0.30506.0\lib\net40\System.Web.Razor.dll</HintPath>
+    <Reference Include="System.Web.Razor, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\packages\Microsoft.AspNet.Razor.3.0.0\lib\net45\System.Web.Razor.dll</HintPath>
     </Reference>
     <Reference Include="System.Xml.Linq" />
     <Reference Include="System.Data.DataSetExtensions" />
@@ -76,6 +75,7 @@
     <Compile Include="RazorEmailTemplatingTests.cs" />
   </ItemGroup>
   <ItemGroup>
+    <None Include="app.config" />
     <None Include="packages.config" />
   </ItemGroup>
   <ItemGroup>
diff --git a/RazorSharpEmail.Tests/app.config b/RazorSharpEmail.Tests/app.config
new file mode 100644
index 0000000..9d5c0fe
--- /dev/null
+++ b/RazorSharpEmail.Tests/app.config
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<configuration>
+  <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>
\ No newline at end of file
diff --git a/RazorSharpEmail.Tests/packages.config b/RazorSharpEmail.Tests/packages.config
index 7d90c30..9acc495 100644
--- a/RazorSharpEmail.Tests/packages.config
+++ b/RazorSharpEmail.Tests/packages.config
@@ -3,7 +3,7 @@
   <package id="ApprovalTests" version="3.0.01" targetFramework="net45" />
   <package id="ApprovalUtilities" version="3.0.01" targetFramework="net45" />
   <package id="FluentAssertions" version="2.0.1" targetFramework="net45" />
-  <package id="Microsoft.AspNet.Razor" version="2.0.30506.0" targetFramework="net45" />
+  <package id="Microsoft.AspNet.Razor" version="3.0.0" targetFramework="net45" />
   <package id="NUnit" version="2.6.2" targetFramework="net45" />
-  <package id="RazorEngine" version="3.3.0" targetFramework="net45" />
+  <package id="RazorEngine" version="3.4.1" targetFramework="net45" />
 </packages>
\ No newline at end of file
diff --git a/RazorSharpEmail/RazorSharpEmail.csproj b/RazorSharpEmail/RazorSharpEmail.csproj
index 92aa20f..e698865 100644
--- a/RazorSharpEmail/RazorSharpEmail.csproj
+++ b/RazorSharpEmail/RazorSharpEmail.csproj
@@ -36,16 +36,15 @@
     <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="RazorEngine, Version=3.3.0.0, Culture=neutral, PublicKeyToken=9ee697374c7e744a, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\packages\RazorEngine.3.3.0\lib\net40\RazorEngine.dll</HintPath>
+    <Reference Include="RazorEngine">
+      <HintPath>..\packages\RazorEngine.3.4.1\lib\net45\RazorEngine.dll</HintPath>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core" />
     <Reference Include="System.Web" />
-    <Reference Include="System.Web.Razor, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <Private>True</Private>
-      <HintPath>..\packages\Microsoft.AspNet.Razor.2.0.30506.0\lib\net40\System.Web.Razor.dll</HintPath>
+    <Reference Include="System.Web.Razor, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\packages\Microsoft.AspNet.Razor.3.0.0\lib\net45\System.Web.Razor.dll</HintPath>
     </Reference>
     <Reference Include="System.Xml.Linq" />
     <Reference Include="System.Data.DataSetExtensions" />
diff --git a/RazorSharpEmail/packages.config b/RazorSharpEmail/packages.config
index f57c85d..1e86820 100644
--- a/RazorSharpEmail/packages.config
+++ b/RazorSharpEmail/packages.config
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="Microsoft.AspNet.Razor" version="2.0.30506.0" targetFramework="net45" />
-  <package id="RazorEngine" version="3.3.0" targetFramework="net45" />
+  <package id="Microsoft.AspNet.Razor" version="3.0.0" targetFramework="net45" />
+  <package id="RazorEngine" version="3.4.1" targetFramework="net45" />
 </packages>
\ No newline at end of file

From 39cca4c974a4970c5cf02e9484d614fd0dbdbba3 Mon Sep 17 00:00:00 2001
From: James Pepplinkhouse <jpepp@ebgames.com>
Date: Tue, 11 Mar 2014 13:53:55 +1000
Subject: [PATCH 2/2] Updated test project app.config binding redirect for
 System.Web.Razor

---
 RazorSharpEmail.Tests/app.config | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/RazorSharpEmail.Tests/app.config b/RazorSharpEmail.Tests/app.config
index 9d5c0fe..e2e0187 100644
--- a/RazorSharpEmail.Tests/app.config
+++ b/RazorSharpEmail.Tests/app.config
@@ -4,7 +4,7 @@
     <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" />
+        <bindingRedirect oldVersion="0.0.0.0-3.0.0.0" newVersion="3.0.0.0" />
       </dependentAssembly>
     </assemblyBinding>
   </runtime>