Permalink
Browse files

pull in from stable

  • Loading branch information...
1 parent 2565737 commit a457e93d8faf83c884223e3339a84976896bdf1b jayt committed May 18, 2012
@@ -101,6 +101,7 @@
</ItemGroup>
<ItemGroup>
<Compile Include="Properties\AssemblyInfo.cs" />
+ <Compile Include="src\ActLikeCaster.cs" />
<Compile Include="src\Dynamic\Mimic.cs" />
<Compile Include="src\Dynamic\Builder.cs" />
<Compile Include="src\Dynamic\CacheableInvocation.cs" />
@@ -58,15 +58,11 @@
// [assembly: AssemblyVersion("1.0.*")]
#if SILVERLIGHT
-<<<<<<< local
+
[assembly: AssemblyVersion("5.7.0.0")]
-=======
-[assembly: AssemblyVersion("5.6.7.0")]
->>>>>>> other
+
#else
-<<<<<<< local
+
[assembly: AssemblyVersion("5.7.0.*")]
-=======
-[assembly: AssemblyVersion("5.6.7.*")]
->>>>>>> other
+
#endif
@@ -41,7 +41,7 @@
<HintPath>..\..\packages\Clay.1.0\lib\ClaySharp.dll</HintPath>
</Reference>
<Reference Include="log4net">
- <HintPath>..\..\packages\log4net.1.2.10\lib\2.0\log4net.dll</HintPath>
+ <HintPath>..\..\packages\log4net.2.0.0\lib\net40-full\log4net.dll</HintPath>
</Reference>
<Reference Include="nunit.framework, Version=2.5.10.11092, Culture=neutral, PublicKeyToken=96d09a1eb7f44a77, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
@@ -4,5 +4,6 @@
<package id="Castle.DynamicProxy" version="2.1.0" />
<package id="Clay" version="1.0" />
<package id="log4net" version="1.2.10" />
+ <package id="log4net" version="2.0.0" />
<package id="NUnit" version="2.5.10.11092" />
</packages>
@@ -192,6 +192,24 @@ public void Fail(string message)
{
throw new AssertionException(message);
}
+
+ public void Throws<T>(Func<object> func) where T:Exception
+ {
+ var tFail = true;
+ try
+ {
+ func();
+ }
+ catch (T e)
+ {
+ tFail = false;
+ }
+
+ if (tFail)
+ {
+ throw new AssertionException(String.Format("Expected {0} to be Thrown", typeof(T)));
+ }
+ }
}
Oops, something went wrong.

0 comments on commit a457e93

Please sign in to comment.