merge dev to master #140

Closed
wants to merge 47 commits into
from
Commits on Oct 9, 2013
  1. Merge pull request #103 from adamralph/92

    adamralph committed Oct 9, 2013
    #92 increment to 2.0.0-alpha01 and clear release notes
Commits on Oct 13, 2013
  1. Merge pull request #110 from xbehave/master

    adamralph committed Oct 13, 2013
    dev catch up with master
Commits on Nov 10, 2013
  1. Merge pull request #112 from xbehave/master

    adamralph committed Nov 10, 2013
    dev catch up with master
Commits on Dec 15, 2013
  1. Merge pull request #116 from xbehave/master

    adamralph committed Dec 15, 2013
    catch up dev with master
Commits on Dec 27, 2013
  1. Merge pull request #119 from xbehave/master

    adamralph committed Dec 27, 2013
    catch up dev with master
Commits on Dec 28, 2013
  1. Merge pull request #122 from adamralph/121

    adamralph committed Dec 28, 2013
    cleaned up Debug/Release mess
  2. Merge pull request #124 from xbehave/master

    adamralph committed Dec 28, 2013
    catch up dev with master
  3. Updated solution with XBehave.Net45.csproj Xbehave.Sdk.Net45.csproj a…

    dschenkelman committed Dec 27, 2013
    …nd test project XBehave.Features.Net45.csproj.
    
    Also updated rakefile.rb and some linked files to work with conditional compilation.
    
    This is to setup the ground for issue #25
  4. Applied feedback by changing capital letters, updating DEBUG and RELE…

    dschenkelman committed Dec 28, 2013
    …ASE targets, added missing nuget packages, etc.
Commits on Dec 30, 2013
Commits on Dec 31, 2013
Commits on Jan 4, 2014
  1. Merge pull request #125 from adamralph/net45

    adamralph committed Jan 4, 2014
    Added NET 4.5 projects
Commits on Jan 7, 2014
Commits on Jan 9, 2014
  1. Merge pull request #127 from xbehave/master

    adamralph committed Jan 9, 2014
    catch up dev with master
Commits on Jan 11, 2014
  1. Refactored to extract Step.cs and separate AsyncStep.cs and SyncStep.…

    dschenkelman committed Jan 11, 2014
    …cs. Still need to support method groups with async void signature.
Commits on Jan 12, 2014
  1. Introduced AsyncTestSyncContext.cs from XUnit project to support asyn…

    dschenkelman committed Jan 12, 2014
    …c void methods. Added unit test for it.
    
    Still need to add tests for exceptions.
Commits on Jan 13, 2014
Commits on Jan 17, 2014
Commits on Jan 25, 2014
Commits on Jan 26, 2014
  1. Merge pull request #128 from dschenkelman/issues/25

    adamralph committed Jan 26, 2014
    Initial proposal to fix #25.
  2. #25 refactor: aligned AsyncStepFeature scenario style, refactored so…

    adamralph committed Jan 26, 2014
    …me scenarios and removed redundant code
  3. Merge pull request #129 from adamralph/25-minor-refactorings

    adamralph committed Jan 26, 2014
    #25 minor refactorings
  4. Merge pull request #130 from adamralph/25

    adamralph committed Jan 26, 2014
    #25 refactor: change Step to have just abstract Execute()
  5. Merge pull request #131 from adamralph/25

    adamralph committed Jan 26, 2014
    #25 refactor: simplified timeouts
Commits on Feb 8, 2014
  1. Merge pull request #134 from xbehave/master

    adamralph committed Feb 8, 2014
    catch up dev with master
Commits on Mar 3, 2014
  1. Merge pull request #136 from adamralph/25

    adamralph committed Mar 3, 2014
    #25 added step overloads with a step context parameter
  2. Merge pull request #137 from adamralph/135

    adamralph committed Mar 3, 2014
    added ObjectDisposalFeature.RegisteringManyDisposableObjectsInASingleSte...
  3. Merge pull request #138 from adamralph/104

    adamralph committed Mar 3, 2014
    #104 changed to version 1.1.0 and cleared release notes
  4. Merge pull request #139 from adamralph/104

    adamralph committed Mar 3, 2014
    #104 addressed all CA violations