From 760303f1d0a6154e0d10c7431d29b03dd73bbd09 Mon Sep 17 00:00:00 2001 From: Ivan Zlatev Date: Sun, 12 Mar 2017 13:54:56 +0000 Subject: [PATCH 1/2] Pull in latest stable version with .NET Standard support for NSubstitute and FakeItEasy. --- .../CommandOptionsSpecs.generated.cs | 9 ++------- .../EngineSpecs.generated.cs | 7 ------- .../InlineConstraintSpecs.generated.cs | 9 ++------- .../MethodCallOccurrenceSpecs.generated.cs | 9 ++------- .../PropertyBehaviorSpecs.generated.cs | 15 +++++---------- .../QueryOptionsSpecs.generated.cs | 9 ++------- Source/Machine.Fakes.Adapters.Specs/project.json | 12 ++++++------ .../Machine.Fakes.FakeItEasy/FakeItEasyEngine.cs | 1 + Source/Machine.Fakes.FakeItEasy/project.json | 9 +++++++-- Source/Machine.Fakes.NSubstitute/project.json | 9 +++++++-- 10 files changed, 34 insertions(+), 55 deletions(-) diff --git a/Source/Machine.Fakes.Adapters.Specs/CommandOptionsSpecs.generated.cs b/Source/Machine.Fakes.Adapters.Specs/CommandOptionsSpecs.generated.cs index e541b80..f552870 100644 --- a/Source/Machine.Fakes.Adapters.Specs/CommandOptionsSpecs.generated.cs +++ b/Source/Machine.Fakes.Adapters.Specs/CommandOptionsSpecs.generated.cs @@ -12,7 +12,7 @@ -#if !NETSTANDARD +#if !NETSTANDARD namespace Machine.Fakes.Adapters.Specs.Rhinomocks @@ -51,13 +51,12 @@ public class Given_an_exception_configured_on_a_command_when_triggering_the_beha } } -#endif +#endif -#if !NETSTANDARD namespace Machine.Fakes.Adapters.Specs.NSubstitute @@ -96,7 +95,6 @@ public class Given_an_exception_configured_on_a_command_when_triggering_the_beha } } -#endif @@ -145,8 +143,6 @@ public class Given_an_exception_configured_on_a_command_when_triggering_the_beha -#if !NETSTANDARD - namespace Machine.Fakes.Adapters.Specs.FakeItEasy { @@ -184,6 +180,5 @@ public class Given_an_exception_configured_on_a_command_when_triggering_the_beha } } -#endif diff --git a/Source/Machine.Fakes.Adapters.Specs/EngineSpecs.generated.cs b/Source/Machine.Fakes.Adapters.Specs/EngineSpecs.generated.cs index 8e2f3a5..92e8601 100644 --- a/Source/Machine.Fakes.Adapters.Specs/EngineSpecs.generated.cs +++ b/Source/Machine.Fakes.Adapters.Specs/EngineSpecs.generated.cs @@ -120,8 +120,6 @@ public class When_faking_a_delegate : WithCurrentEngine #endif -#if !NETSTANDARD - namespace Machine.Fakes.Adapters.Specs.NSubstitute { @@ -234,7 +232,6 @@ public class When_faking_a_delegate : WithCurrentEngine } } -#endif @@ -352,7 +349,6 @@ public class When_faking_a_delegate : WithCurrentEngine -#if !NETSTANDARD namespace Machine.Fakes.Adapters.Specs.FakeItEasy { @@ -466,6 +462,3 @@ public class When_faking_a_delegate : WithCurrentEngine } } -#endif - - diff --git a/Source/Machine.Fakes.Adapters.Specs/InlineConstraintSpecs.generated.cs b/Source/Machine.Fakes.Adapters.Specs/InlineConstraintSpecs.generated.cs index 352f431..6f18515 100644 --- a/Source/Machine.Fakes.Adapters.Specs/InlineConstraintSpecs.generated.cs +++ b/Source/Machine.Fakes.Adapters.Specs/InlineConstraintSpecs.generated.cs @@ -10,7 +10,7 @@ using Machine.Specifications; -#if !NETSTANDARD +#if !NETSTANDARD namespace Machine.Fakes.Adapters.Specs.Rhinomocks @@ -354,12 +354,11 @@ public class When_matching_for_equality_without_explicit__Param__constraint_and_ } } -#endif +#endif -#if !NETSTANDARD namespace Machine.Fakes.Adapters.Specs.NSubstitute @@ -703,7 +702,6 @@ public class When_matching_for_equality_without_explicit__Param__constraint_and_ } } -#endif @@ -1055,7 +1053,6 @@ public class When_matching_for_equality_without_explicit__Param__constraint_and_ -#if !NETSTANDARD namespace Machine.Fakes.Adapters.Specs.FakeItEasy @@ -1399,6 +1396,4 @@ public class When_matching_for_equality_without_explicit__Param__constraint_and_ } } -#endif - diff --git a/Source/Machine.Fakes.Adapters.Specs/MethodCallOccurrenceSpecs.generated.cs b/Source/Machine.Fakes.Adapters.Specs/MethodCallOccurrenceSpecs.generated.cs index 59405ee..9527305 100644 --- a/Source/Machine.Fakes.Adapters.Specs/MethodCallOccurrenceSpecs.generated.cs +++ b/Source/Machine.Fakes.Adapters.Specs/MethodCallOccurrenceSpecs.generated.cs @@ -11,7 +11,7 @@ using Machine.Specifications; -#if !NETSTANDARD +#if !NETSTANDARD @@ -139,11 +139,10 @@ public class Given_a_command_was_configured_on_a_fake_when_verifying_whether_it_ } } -#endif +#endif -#if !NETSTANDARD @@ -271,7 +270,6 @@ public class Given_a_command_was_configured_on_a_fake_when_verifying_whether_it_ } } -#endif @@ -405,8 +403,6 @@ public class Given_a_command_was_configured_on_a_fake_when_verifying_whether_it_ -#if !NETSTANDARD - namespace Machine.Fakes.Adapters.Specs.FakeItEasy @@ -533,5 +529,4 @@ public class Given_a_command_was_configured_on_a_fake_when_verifying_whether_it_ } } -#endif diff --git a/Source/Machine.Fakes.Adapters.Specs/PropertyBehaviorSpecs.generated.cs b/Source/Machine.Fakes.Adapters.Specs/PropertyBehaviorSpecs.generated.cs index 454f4c7..83ea2c8 100644 --- a/Source/Machine.Fakes.Adapters.Specs/PropertyBehaviorSpecs.generated.cs +++ b/Source/Machine.Fakes.Adapters.Specs/PropertyBehaviorSpecs.generated.cs @@ -10,8 +10,8 @@ using Machine.Specifications; - -#if !NETSTANDARD + +#if !NETSTANDARD namespace Machine.Fakes.Adapters.Specs.Rhinomocks @@ -76,12 +76,10 @@ public class When_setting_up_a_return_value_for_a_property_with_getter_and_sette } } -#endif +#endif - -#if !NETSTANDARD namespace Machine.Fakes.Adapters.Specs.NSubstitute @@ -146,11 +144,10 @@ public class When_setting_up_a_return_value_for_a_property_with_getter_and_sette } } -#endif - + namespace Machine.Fakes.Adapters.Specs.Moq @@ -218,8 +215,7 @@ public class When_setting_up_a_return_value_for_a_property_with_getter_and_sette - -#if !NETSTANDARD + namespace Machine.Fakes.Adapters.Specs.FakeItEasy @@ -284,6 +280,5 @@ public class When_setting_up_a_return_value_for_a_property_with_getter_and_sette } } -#endif diff --git a/Source/Machine.Fakes.Adapters.Specs/QueryOptionsSpecs.generated.cs b/Source/Machine.Fakes.Adapters.Specs/QueryOptionsSpecs.generated.cs index 7a52dea..8763d21 100644 --- a/Source/Machine.Fakes.Adapters.Specs/QueryOptionsSpecs.generated.cs +++ b/Source/Machine.Fakes.Adapters.Specs/QueryOptionsSpecs.generated.cs @@ -12,7 +12,7 @@ using Machine.Specifications; -#if !NETSTANDARD +#if !NETSTANDARD @@ -96,12 +96,11 @@ public class Given_an_exception_configured_on_a_query_when_triggering_the_behavi } } -#endif +#endif -#if !NETSTANDARD @@ -185,8 +184,6 @@ public class Given_an_exception_configured_on_a_query_when_triggering_the_behavi } } -#endif - @@ -277,7 +274,6 @@ public class Given_an_exception_configured_on_a_query_when_triggering_the_behavi -#if !NETSTANDARD @@ -361,6 +357,5 @@ public class Given_an_exception_configured_on_a_query_when_triggering_the_behavi } } -#endif diff --git a/Source/Machine.Fakes.Adapters.Specs/project.json b/Source/Machine.Fakes.Adapters.Specs/project.json index 0e93657..5fa2759 100644 --- a/Source/Machine.Fakes.Adapters.Specs/project.json +++ b/Source/Machine.Fakes.Adapters.Specs/project.json @@ -18,12 +18,6 @@ }, "Machine.Fakes.Rhinomocks": { "target": "project" - }, - "Machine.Fakes.NSubstitute": { - "target": "project" - }, - "Machine.Fakes.FakeItEasy": { - "target": "project" } } }, @@ -48,6 +42,12 @@ "dotnet-test-mspec": "0.2-*", "Machine.Fakes.Moq": { "target": "project" + }, + "Machine.Fakes.NSubstitute": { + "target": "project" + }, + "Machine.Fakes.FakeItEasy": { + "target": "project" } } } diff --git a/Source/Machine.Fakes.FakeItEasy/FakeItEasyEngine.cs b/Source/Machine.Fakes.FakeItEasy/FakeItEasyEngine.cs index 10488f0..38f4965 100644 --- a/Source/Machine.Fakes.FakeItEasy/FakeItEasyEngine.cs +++ b/Source/Machine.Fakes.FakeItEasy/FakeItEasyEngine.cs @@ -2,6 +2,7 @@ using System.Collections; using System.Collections.Generic; using System.Linq.Expressions; +using System.Reflection; using FakeItEasy; using FakeItEasy.Creation; diff --git a/Source/Machine.Fakes.FakeItEasy/project.json b/Source/Machine.Fakes.FakeItEasy/project.json index 7ac49ae..d9a9d30 100644 --- a/Source/Machine.Fakes.FakeItEasy/project.json +++ b/Source/Machine.Fakes.FakeItEasy/project.json @@ -15,12 +15,17 @@ "Machine Project" ], "frameworks": { - "net40": {} + "net40": {}, + "netstandard1.6": { + "dependencies": { + "NETStandard.Library": "1.6.0" + } + } }, "dependencies": { "Machine.Fakes": { "target": "project" }, - "FakeItEasy": "2.0.0" + "FakeItEasy": "3.1.0" } } \ No newline at end of file diff --git a/Source/Machine.Fakes.NSubstitute/project.json b/Source/Machine.Fakes.NSubstitute/project.json index c06c4d8..3979a5c 100644 --- a/Source/Machine.Fakes.NSubstitute/project.json +++ b/Source/Machine.Fakes.NSubstitute/project.json @@ -15,12 +15,17 @@ "Machine Project" ], "frameworks": { - "net40": {} + "net40": {}, + "netstandard1.5": { + "dependencies": { + "NETStandard.Library": "1.6.0" + } + } }, "dependencies": { "Machine.Fakes": { "target": "project" }, - "NSubstitute": "1.8.2" + "NSubstitute": "2.0.2" } } \ No newline at end of file From e0b09c84fccd2b14e5401c0f548ac3f8192fad61 Mon Sep 17 00:00:00 2001 From: Ivan Zlatev Date: Sun, 12 Mar 2017 13:57:23 +0000 Subject: [PATCH 2/2] 2.8.0 --- appveyor.yml | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index ff2eb1e..ee3340b 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -1,13 +1,12 @@ environment: - nuget_version: '2.8.0-beta4' - nuget_prerelease: true + nuget_version: '2.8.0' + nuget_prerelease: false assembly_version: '2.8.0.0' deploy: - provider: GitHub description: | - * Support for .NET Standard 1.3 and NET Core. (only the Moq adaptor support .NET Standard) - * Beta due to Machine.Specifications being in -rc1 and Moq for .NET Standard in alpha + * .NET Core / .NET Standard support for NSubstitute, FakeItEasy and Moq. on: appveyor_repo_tag: true