Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions Email/Email.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -32,15 +32,15 @@
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<ItemGroup>
<Reference Include="RazorEngine, Version=3.3.0.0, Culture=neutral, PublicKeyToken=9ee697374c7e744a, processorArchitecture=MSIL">
<Reference Include="RazorEngine, Version=3.5.0.0, Culture=neutral, PublicKeyToken=9ee697374c7e744a, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\packages\RazorEngine.3.3.0\lib\net40\RazorEngine.dll</HintPath>
<HintPath>..\packages\RazorEngine.3.4.2\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" />
Expand Down
4 changes: 2 additions & 2 deletions Email/packages.config
Original file line number Diff line number Diff line change
@@ -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.2" targetFramework="net45" />
</packages>
10 changes: 5 additions & 5 deletions RazorSharpEmail.Tests/RazorSharpEmail.Tests.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -48,15 +48,15 @@
<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">
<Reference Include="RazorEngine, Version=3.5.0.0, Culture=neutral, PublicKeyToken=9ee697374c7e744a, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\packages\RazorEngine.3.3.0\lib\net40\RazorEngine.dll</HintPath>
<HintPath>..\packages\RazorEngine.3.4.2\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" />
Expand Down
4 changes: 2 additions & 2 deletions RazorSharpEmail.Tests/SimpleEmailFormattingTests.cs
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ public void TestFixtureTearDown()
[MethodImpl(MethodImplOptions.NoInlining)]
public void Given_a_model_the_email_should_format_the_email_correctly()
{
var viewBag = new DynamicViewBag();
var viewBag = new DynamicViewBag(null);
var email = _emailFormatter.BuildTemplatedEmailFrom(
new SimpleEmailModel
{
Expand All @@ -47,7 +47,7 @@ public void Given_a_model_the_email_should_format_the_email_correctly()
[MethodImpl(MethodImplOptions.NoInlining)]
public void Given_a_model_the_email_should_format_and_layout_the_email_correctly()
{
var viewBag = new DynamicViewBag();
var viewBag = new DynamicViewBag(null);
var templatedEmail = _emailFormatter.BuildTemplatedEmailFrom(
new SimpleEmailModel
{
Expand Down
4 changes: 2 additions & 2 deletions RazorSharpEmail.Tests/packages.config
Original file line number Diff line number Diff line change
Expand Up @@ -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.2" targetFramework="net45" />
</packages>
4 changes: 2 additions & 2 deletions RazorSharpEmail/RazorEmailFormatter.cs
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ public TemplatedEmail BuildTemplatedEmailFrom<TModel>(TModel model, DynamicViewB

var templatedEmail = new TemplatedEmail();

if (viewBag == null) viewBag = new DynamicViewBag();
if (viewBag == null) viewBag = new DynamicViewBag(null);

// Parse the email subject and cleanse newline characters (otherwise the email class will throw)
templatedEmail.Subject = HttpUtility.HtmlDecode(_templateService.Run(_emailTemplateInitializer.GetSubjectTemplateName(typeof(TModel), language), model, viewBag: viewBag)).CleanseCRLF();
Expand All @@ -49,7 +49,7 @@ public TemplatedEmailAfterLayout LayoutTemplatedEmail(TemplatedEmail templatedEm
{
var templatedEmailAfterLayout = new TemplatedEmailAfterLayout();

if (viewBag == null) viewBag = new DynamicViewBag();
if (viewBag == null) viewBag = new DynamicViewBag(null);

templatedEmailAfterLayout.Subject = templatedEmail.Subject;
templatedEmailAfterLayout.PlainText = LayoutPlainTextContent(templatedEmail, viewBag);
Expand Down
10 changes: 5 additions & 5 deletions RazorSharpEmail/RazorSharpEmail.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -36,16 +36,16 @@
<Prefer32Bit>false</Prefer32Bit>
</PropertyGroup>
<ItemGroup>
<Reference Include="RazorEngine, Version=3.3.0.0, Culture=neutral, PublicKeyToken=9ee697374c7e744a, processorArchitecture=MSIL">
<Reference Include="RazorEngine, Version=3.5.0.0, Culture=neutral, PublicKeyToken=9ee697374c7e744a, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\packages\RazorEngine.3.3.0\lib\net40\RazorEngine.dll</HintPath>
<HintPath>..\packages\RazorEngine.3.4.2\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" />
Expand Down
4 changes: 2 additions & 2 deletions RazorSharpEmail/packages.config
Original file line number Diff line number Diff line change
@@ -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.2" targetFramework="net45" />
</packages>