NSpec.dll now targets .NET 3.5 and as such now allows using Visual St…

…udio 2008 for spec projects
idavis · Apr 23, 2011 · bdb1276 · bdb1276
1 parent 5e90eda
commit bdb1276
Show file tree

Hide file tree

Showing 12 changed files with 89 additions and 87 deletions.
diff --git a/NSpec/Extensions.cs b/NSpec/Extensions.cs
@@ -50,11 +50,11 @@ public static IEnumerable<T> EachConsecutive2<T>(this IEnumerable<T> source, Act
         /// <summary>
         /// Action(T, U) will get executed for each item in the list.  You can use this to specify a suite of data that needs to be execute across a common set of examples.
         /// </summary>
-        public static void Do<T, U>(this Tuples<T, U> source, Action<T, U> action)
-        {
-            foreach (var tup in source)
-                action(tup.Item1, tup.Item2);
-        }
+        //public static void Do<T, U>(this Tuples<T, U> source, Action<T, U> action)
+        //{
+        //    foreach (var tup in source)
+        //        action(tup.Item1, tup.Item2);
+        //}
 
         /// <summary>
         /// Action(T, U) will get executed for each item in the list.  You can use this to specify a suite of data that needs to be execute across a common set of examples.
@@ -68,20 +68,20 @@ public static void Do<T, U>(this Dictionary<T, U> source, Action<T, U> action)
         /// <summary>
         /// Action(T, U, V) will get executed for each item in the list.  You can use this to specify a suite of data that needs to be execute across a common set of examples.
         /// </summary>
-        public static void Do<T, U, V>(this Tuples<T, U, V> source, Action<T, U, V> action)
-        {
-            foreach (var tup in source)
-                action(tup.Item1, tup.Item2, tup.Item3);
-        }
+        //public static void Do<T, U, V>(this Tuples<T, U, V> source, Action<T, U, V> action)
+        //{
+        //    foreach (var tup in source)
+        //        action(tup.Item1, tup.Item2, tup.Item3);
+        //}
 
         /// <summary>
         /// Action(T, U, V, W) will get executed for each item in the list.  You can use this to specify a suite of data that needs to be execute across a common set of examples.
         /// </summary>
-        public static void Do<T, U, V, W>(this Tuples<T, U, V, W> source, Action<T, U, V, W> action)
-        {
-            foreach (var tup in source)
-                action(tup.Item1, tup.Item2, tup.Item3, tup.Item4);
-        }
+        //public static void Do<T, U, V, W>(this Tuples<T, U, V, W> source, Action<T, U, V, W> action)
+        //{
+        //    foreach (var tup in source)
+        //        action(tup.Item1, tup.Item2, tup.Item3, tup.Item4);
+        //}
 
         /// <summary>
         /// Action will be executed n number of times.

diff --git a/NSpec/NSpec.csproj b/NSpec/NSpec.csproj
@@ -10,8 +10,9 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>NSpec</RootNamespace>
     <AssemblyName>NSpec</AssemblyName>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
+    <TargetFrameworkProfile />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -39,7 +40,6 @@
     <Reference Include="System.Core" />
     <Reference Include="System.Xml.Linq" />
     <Reference Include="System.Data.DataSetExtensions" />
-    <Reference Include="Microsoft.CSharp" />
     <Reference Include="System.Data" />
     <Reference Include="System.Xml" />
   </ItemGroup>

diff --git a/NSpec/Properties/AssemblyInfo.cs b/NSpec/Properties/AssemblyInfo.cs
@@ -32,5 +32,5 @@
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("0.9.28")]
-[assembly: AssemblyFileVersion("0.9.28")]
+[assembly: AssemblyVersion("0.9.29")]
+[assembly: AssemblyFileVersion("0.9.29")]
diff --git a/NSpec/Tuples.cs b/NSpec/Tuples.cs
@@ -3,39 +3,39 @@
 
 namespace NSpec
 {
-    /// <summary>
-    /// This is a way for you to specify a collection of test data that needs to be asserted over a common set of examples.  New one of these up inline and tack on the .Do extension method for some
-    /// powerful ways to execute examples across the collection.  For more information, visit http://www.nspedriven.net.
-    /// </summary>
-    public class Tuples<T, U> : List<Tuple<T,U>> 
-    {
-        public void Add(T t, U u)
-        {
-            base.Add(new Tuple<T,U>(t,u));
-        }
-    }
+    ///// <summary>
+    ///// This is a way for you to specify a collection of test data that needs to be asserted over a common set of examples.  New one of these up inline and tack on the .Do extension method for some
+    ///// powerful ways to execute examples across the collection.  For more information, visit http://www.nspedriven.net.
+    ///// </summary>
+    //public class Tuples<T, U> : List<Tuple<T,U>> 
+    //{
+    //    public void Add(T t, U u)
+    //    {
+    //        base.Add(new Tuple<T,U>(t,u));
+    //    }
+    //}
 
-    /// <summary>
-    /// This is a way for you to specify a collection of test data that needs to be asserted over a common set of examples.  New one of these up inline and tack on the .Do extension method for some
-    /// powerful ways to execute examples across the collection.  For more information, visit http://www.nspedriven.net.
-    /// </summary>
-    public class Tuples<T, U, V> : List<Tuple<T, U, V>>
-    {
-        public void Add(T t, U u, V v)
-        {
-            base.Add(new Tuple<T, U, V>(t, u, v));
-        }
-    }
+    ///// <summary>
+    ///// This is a way for you to specify a collection of test data that needs to be asserted over a common set of examples.  New one of these up inline and tack on the .Do extension method for some
+    ///// powerful ways to execute examples across the collection.  For more information, visit http://www.nspedriven.net.
+    ///// </summary>
+    //public class Tuples<T, U, V> : List<Tuple<T, U, V>>
+    //{
+    //    public void Add(T t, U u, V v)
+    //    {
+    //        base.Add(new Tuple<T, U, V>(t, u, v));
+    //    }
+    //}
 
-    /// <summary>
-    /// This is a way for you to specify a collection of test data that needs to be asserted over a common set of examples.  New one of these up inline and tack on the .Do extension method for some
-    /// powerful ways to execute examples across the collection.  For more information, visit http://www.nspedriven.net.
-    /// </summary>
-    public class Tuples<T, U, V, W> : List<Tuple<T, U, V, W>>
-    {
-        public void Add(T t, U u, V v, W w)
-        {
-            base.Add(new Tuple<T, U, V, W>(t, u, v, w));
-        }
-    }
+    ///// <summary>
+    ///// This is a way for you to specify a collection of test data that needs to be asserted over a common set of examples.  New one of these up inline and tack on the .Do extension method for some
+    ///// powerful ways to execute examples across the collection.  For more information, visit http://www.nspedriven.net.
+    ///// </summary>
+    //public class Tuples<T, U, V, W> : List<Tuple<T, U, V, W>>
+    //{
+    //    public void Add(T t, U u, V v, W w)
+    //    {
+    //        base.Add(new Tuple<T, U, V, W>(t, u, v, w));
+    //    }
+    //}
 }
diff --git a/NSpecRunner/Properties/AssemblyInfo.cs b/NSpecRunner/Properties/AssemblyInfo.cs
@@ -32,5 +32,5 @@
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("0.9.28")]
-[assembly: AssemblyFileVersion("0.9.28")]
+[assembly: AssemblyVersion("0.9.29")]
+[assembly: AssemblyFileVersion("0.9.29")]
diff --git a/NSpecSpecs/Properties/AssemblyInfo.cs b/NSpecSpecs/Properties/AssemblyInfo.cs
@@ -32,5 +32,5 @@
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("0.9.28")]
-[assembly: AssemblyFileVersion("0.9.28")]
+[assembly: AssemblyVersion("0.9.29")]
+[assembly: AssemblyFileVersion("0.9.29")]
diff --git a/NSpecVSExtension/Properties/AssemblyInfo.cs b/NSpecVSExtension/Properties/AssemblyInfo.cs
@@ -29,5 +29,5 @@
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("0.9.28")]
-[assembly: AssemblyFileVersion("0.9.28")]
+[assembly: AssemblyVersion("0.9.29")]
+[assembly: AssemblyFileVersion("0.9.29")]
diff --git a/RakeFile b/RakeFile
@@ -21,10 +21,11 @@ end
 task :commit => :pull do
   `git add -A .`
   `git commit -m "#{ENV['m']}`
-  `git tag -a v#{get_version_node.text} -m "#{get_version_node.text}"`
+  `git tag -a v#{get_version_node.text} -m "#{get_version_node.text}" HEAD`
   `git push --tags`
 end
 
+desc 'supply commit message as parameter - rake all m="commit message" - version bump, nuget, zip and everything shall be done for you'
 task :all => [:pull,:version,:nuget,:commit,:website,:zip,:upload]
 
 task :zip do

diff --git a/SampleSpecs/Demo/describe_car.cs b/SampleSpecs/Demo/describe_car.cs
@@ -69,29 +69,29 @@ void describe_compression_ratio()
     {
         Car car = null;
 
-        new Tuples<int, int, double> 
-        { 
-            { 7, 87, .28 }, 
-            { 8, 92, .30 }, 
-            { 9, 96, .32 }
-        }.Do(
-        (compressionRatio, octane, effeciency) =>
-        {
-            context["car has compression ratio of {0} to 1".With(compressionRatio)] = () =>
-            {
-                before = () => car = new Car(compressionRatio);
-
-                it["should have octane requirement of {0}".With(octane)] = () =>
-                {
-                    car.OctaneRequirement.should_be(octane);
-                };
-
-                it["should have brake thermal efficiency of {0}%".With(effeciency * 100)] = () =>
-                {
-                    car.BrakeThermalEffeciency.should_be(effeciency);
-                };
-            };
-        });
+        //new Tuples<int, int, double> 
+        //{ 
+        //    { 7, 87, .28 }, 
+        //    { 8, 92, .30 }, 
+        //    { 9, 96, .32 }
+        //}.Do(
+        //(compressionRatio, octane, effeciency) =>
+        //{
+        //    context["car has compression ratio of {0} to 1".With(compressionRatio)] = () =>
+        //    {
+        //        before = () => car = new Car(compressionRatio);
+
+        //        it["should have octane requirement of {0}".With(octane)] = () =>
+        //        {
+        //            car.OctaneRequirement.should_be(octane);
+        //        };
+
+        //        it["should have brake thermal efficiency of {0}%".With(effeciency * 100)] = () =>
+        //        {
+        //            car.BrakeThermalEffeciency.should_be(effeciency);
+        //        };
+        //    };
+        //});
     }
 
     void when_driving_car()

diff --git a/SampleSpecs/Demo/prime_kata.cs b/SampleSpecs/Demo/prime_kata.cs
@@ -11,7 +11,7 @@ void prime_factors()
             //throwing an unhandled exception should now not cause the runner to crash
             //var dict = new Dictionary<int, string> { { 1, "1" }, { 1, "sdfg" } };
 
-            new Tuples<int, int[]>
+            new Dictionary<int, int[]>
             {
                 { 1, new int[]{}},
                 { 2, new[]{ 2 }},

diff --git a/SampleSpecs/WebSite/describe_PrimeFactors.cs b/SampleSpecs/WebSite/describe_PrimeFactors.cs
@@ -1,11 +1,12 @@
-using NSpec;
+using System.Collections.Generic;
+using NSpec;
 
 class describe_PrimeFactors : nspec
 {
     void when_determining_prime_factors()
     {
-        new Tuples<int, int[]>
-        {
+        new Dictionary<int,int[]>
+            {
             { 0, new int[] { } },
             { 1, new int[] { } },
             { 2, new[] { 2 } },

diff --git a/nspec.nuspec b/nspec.nuspec
@@ -2,7 +2,7 @@
 <package xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
   <metadata xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
     <id>nspec</id>
-    <version>0.9.28</version>
+    <version>0.9.29</version>
     <iconUrl>http://nspec.org/themes/contoso/content/images/logo.png</iconUrl>
     <licenseUrl>https://github.com/mattflo/NSpec/blob/master/license.txt</licenseUrl>
     <authors>Matt Florence, Amir Rajan</authors>