Skip to content

Commit

Permalink
Revert "spring cleaning in Contrib areas, more share of code between …
Browse files Browse the repository at this point in the history
…framework versions in Contrib"

This reverts commit 27abc44.
  • Loading branch information
johandanforth committed May 1, 2015
1 parent 2d0ae2b commit c8bd264
Show file tree
Hide file tree
Showing 12 changed files with 1,362 additions and 518 deletions.
5 changes: 1 addition & 4 deletions Dapper.Contrib NET45/Dapper.Contrib NET45.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -44,10 +44,7 @@
<Compile Include="..\Dapper.Contrib\Properties\AssemblyInfo.cs">
<Link>AssemblyInfo.cs</Link>
</Compile>
<Compile Include="..\Dapper.Contrib\SqlMapperExtensions.cs">
<Link>SqlMapperExtensions.cs</Link>
</Compile>
<Compile Include="SqlMapperExtensionsAsync.cs" />
<Compile Include="SqlMapperExtensions.cs" />
</ItemGroup>
<ItemGroup>
<Folder Include="Properties\" />
Expand Down
853 changes: 853 additions & 0 deletions Dapper.Contrib NET45/SqlMapperExtensions.cs

Large diffs are not rendered by default.

300 changes: 0 additions & 300 deletions Dapper.Contrib NET45/SqlMapperExtensionsAsync.cs

This file was deleted.

53 changes: 53 additions & 0 deletions Dapper.Contrib.Tests NET45/Assert.cs
Original file line number Diff line number Diff line change
@@ -0,0 +1,53 @@
using System;
using System.Collections.Generic;
using System.Linq;

namespace Dapper.Contrib.Tests_NET45
{
/// <summary>
/// Assert extensions borrowed from Sam's code in DapperTests
/// </summary>
static class Assert
{
public static void IsEqualTo<T>(this T obj, T other)
{
if (!obj.Equals(other))
{
throw new ApplicationException(string.Format("{0} should be equals to {1}", obj, other));
}
}

public static void IsSequenceEqualTo<T>(this IEnumerable<T> obj, IEnumerable<T> other)
{
if (!obj.SequenceEqual(other))
{
throw new ApplicationException(string.Format("{0} should be equals to {1}", obj, other));
}
}

public static void IsFalse(this bool b)
{
if (b)
{
throw new ApplicationException("Expected false");
}
}

public static void IsTrue(this bool b)
{
if (!b)
{
throw new ApplicationException("Expected true");
}
}

public static void IsNull(this object obj)
{
if (obj != null)
{
throw new ApplicationException("Expected null");
}
}

}
}
10 changes: 3 additions & 7 deletions Dapper.Contrib.Tests NET45/Dapper.Contrib.Tests NET45.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<ProjectGuid>{7A85178F-4ADC-4E4C-BF08-17FC99488A9A}</ProjectGuid>
<OutputType>Exe</OutputType>
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>Dapper.Contrib.Tests</RootNamespace>
<RootNamespace>Dapper.Contrib.Tests_NET45</RootNamespace>
<AssemblyName>Dapper.Contrib.Tests NET45</AssemblyName>
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
Expand Down Expand Up @@ -42,14 +42,10 @@
<Reference Include="System.Xml" />
</ItemGroup>
<ItemGroup>
<Compile Include="..\Dapper.Contrib.Tests\Assert.cs">
<Link>Assert.cs</Link>
</Compile>
<Compile Include="..\Dapper.Contrib.Tests\Tests.cs">
<Link>Tests.cs</Link>
</Compile>
<Compile Include="Assert.cs" />
<Compile Include="Program.cs" />
<Compile Include="Properties\AssemblyInfo.cs" />
<Compile Include="Tests.cs" />
<Compile Include="TestsAsync.cs" />
</ItemGroup>
<ItemGroup>
Expand Down
Loading

0 comments on commit c8bd264

Please sign in to comment.