Merge pull request #119 from xbehave/master

catch up dev with master
adamralph · Dec 27, 2013 · 825fcc7 · 825fcc7
2 parents d9473d0 + 4e25a40
commit 825fcc7
Show file tree

Hide file tree

Showing 28 changed files with 21 additions and 946 deletions.
diff --git a/rakefile.rb b/rakefile.rb
@@ -20,11 +20,6 @@
   { :command => xunit_command_net40, :assembly => "src/test/Xbehave.Features.Net40/bin/Debug/Xbehave.Features.Net40.dll" }
 ]
 
-samples = [
-  { :command => xunit_command_net20, :assembly => "src/Xbehave.Samples.Net35/bin/Debug/Xbehave.Samples.Net35.dll" },
-  { :command => xunit_command_net40, :assembly => "src/Xbehave.Samples.Net40/bin/Debug/Xbehave.Samples.Net40.dll" }
-]
-
 nuspec = "src/Xbehave.nuspec"
 
 Albacore.configure do |config|
@@ -66,11 +61,6 @@
   cmd.parameters "pack " + nuspec + " -Version " + version + " -OutputDirectory " + output
 end
 
-desc "Execute samples"
-task :sample => [:build] do
-  execute_xunit samples
-end
-
 def execute_xunit(tests)
   tests.each do |test|
     xunit = XUnitTestRunner.new

diff --git a/src/Xbehave.Samples.FSharp.Net45/ComputationBuilder.fs b/src/Xbehave.Samples.FSharp.Net45/ComputationBuilder.fs
diff --git a/src/Xbehave.Samples.FSharp.Net45/CustomOperator.fs b/src/Xbehave.Samples.FSharp.Net45/CustomOperator.fs
diff --git a/src/Xbehave.Samples.FSharp.Net45/DirectConversion.fs b/src/Xbehave.Samples.FSharp.Net45/DirectConversion.fs
diff --git a/src/Xbehave.Samples.FSharp.Net45/Pipes.fs b/src/Xbehave.Samples.FSharp.Net45/Pipes.fs
diff --git a/src/Xbehave.Samples.FSharp.Net45/Xbehave.Samples.FSharp.Net45.fsproj b/src/Xbehave.Samples.FSharp.Net45/Xbehave.Samples.FSharp.Net45.fsproj
diff --git a/src/Xbehave.Samples.FSharp.Net45/packages.config b/src/Xbehave.Samples.FSharp.Net45/packages.config