diff --git a/.gitignore b/.gitignore index aa4b703..fb7012e 100644 --- a/.gitignore +++ b/.gitignore @@ -1,28 +1,356 @@ -*.swp -*.*~ -project.lock.json -.DS_Store -*.pyc -nupkg/ - -# Visual Studio Code -.vscode +## Ignore Visual Studio temporary files, build results, and +## files generated by popular Visual Studio add-ons. +## +## Get latest from https://github.com/github/gitignore/blob/master/VisualStudio.gitignore # User-specific files +*.rsuser *.suo *.user *.userosscache *.sln.docstates +# User-specific files (MonoDevelop/Xamarin Studio) +*.userprefs + +# Mono auto generated files +mono_crash.* + # Build results [Dd]ebug/ +[Dd]ebugPublic/ [Rr]elease/ +[Rr]eleases/ +x64/ +x86/ +[Aa][Rr][Mm]/ +[Aa][Rr][Mm]64/ +bld/ [Bb]in/ [Oo]bj/ -[Oo]ut/ -msbuild.log -msbuild.err -msbuild.wrn +[Ll]og/ +[Ll]ogs/ -# Visual Studio 2015 +# Visual Studio 2015/2017 cache/options directory .vs/ +# Uncomment if you have tasks that create the project's static files in wwwroot +#wwwroot/ + +# Visual Studio 2017 auto generated files +Generated\ Files/ + +# MSTest test Results +[Tt]est[Rr]esult*/ +[Bb]uild[Ll]og.* + +# NUnit +*.VisualState.xml +TestResult.xml +nunit-*.xml + +# Build Results of an ATL Project +[Dd]ebugPS/ +[Rr]eleasePS/ +dlldata.c + +# Benchmark Results +BenchmarkDotNet.Artifacts/ + +# .NET Core +project.lock.json +project.fragment.lock.json +artifacts/ + +# StyleCop +StyleCopReport.xml + +# Files built by Visual Studio +*_i.c +*_p.c +*_h.h +*.ilk +*.meta +*.obj +*.iobj +*.pch +*.pdb +*.ipdb +*.pgc +*.pgd +*.rsp +*.sbr +*.tlb +*.tli +*.tlh +*.tmp +*.tmp_proj +*_wpftmp.csproj +*.log +*.vspscc +*.vssscc +.builds +*.pidb +*.svclog +*.scc + +# Chutzpah Test files +_Chutzpah* + +# Visual C++ cache files +ipch/ +*.aps +*.ncb +*.opendb +*.opensdf +*.sdf +*.cachefile +*.VC.db +*.VC.VC.opendb + +# Visual Studio profiler +*.psess +*.vsp +*.vspx +*.sap + +# Visual Studio Trace Files +*.e2e + +# TFS 2012 Local Workspace +$tf/ + +# Guidance Automation Toolkit +*.gpState + +# ReSharper is a .NET coding add-in +_ReSharper*/ +*.[Rr]e[Ss]harper +*.DotSettings.user + +# JustCode is a .NET coding add-in +.JustCode + +# TeamCity is a build add-in +_TeamCity* + +# DotCover is a Code Coverage Tool +*.dotCover + +# AxoCover is a Code Coverage Tool +.axoCover/* +!.axoCover/settings.json + +# Visual Studio code coverage results +*.coverage +*.coveragexml + +# NCrunch +_NCrunch_* +.*crunch*.local.xml +nCrunchTemp_* + +# MightyMoose +*.mm.* +AutoTest.Net/ + +# Web workbench (sass) +.sass-cache/ + +# Installshield output folder +[Ee]xpress/ + +# DocProject is a documentation generator add-in +DocProject/buildhelp/ +DocProject/Help/*.HxT +DocProject/Help/*.HxC +DocProject/Help/*.hhc +DocProject/Help/*.hhk +DocProject/Help/*.hhp +DocProject/Help/Html2 +DocProject/Help/html + +# Click-Once directory +publish/ + +# Publish Web Output +*.[Pp]ublish.xml +*.azurePubxml +# Note: Comment the next line if you want to checkin your web deploy settings, +# but database connection strings (with potential passwords) will be unencrypted +*.pubxml +*.publishproj + +# Microsoft Azure Web App publish settings. Comment the next line if you want to +# checkin your Azure Web App publish settings, but sensitive information contained +# in these scripts will be unencrypted +PublishScripts/ + +# NuGet Packages +*.nupkg +# NuGet Symbol Packages +*.snupkg +# The packages folder can be ignored because of Package Restore +**/[Pp]ackages/* +# except build/, which is used as an MSBuild target. +!**/[Pp]ackages/build/ +# Uncomment if necessary however generally it will be regenerated when needed +#!**/[Pp]ackages/repositories.config +# NuGet v3's project.json files produces more ignorable files +*.nuget.props +*.nuget.targets + +# Microsoft Azure Build Output +csx/ +*.build.csdef + +# Microsoft Azure Emulator +ecf/ +rcf/ + +# Windows Store app package directories and files +AppPackages/ +BundleArtifacts/ +Package.StoreAssociation.xml +_pkginfo.txt +*.appx +*.appxbundle +*.appxupload + +# Visual Studio cache files +# files ending in .cache can be ignored +*.[Cc]ache +# but keep track of directories ending in .cache +!?*.[Cc]ache/ + +# Others +ClientBin/ +~$* +*~ +*.dbmdl +*.dbproj.schemaview +*.jfm +*.pfx +*.publishsettings +orleans.codegen.cs + +# Including strong name files can present a security risk +# (https://github.com/github/gitignore/pull/2483#issue-259490424) +#*.snk + +# Since there are multiple workflows, uncomment next line to ignore bower_components +# (https://github.com/github/gitignore/pull/1529#issuecomment-104372622) +#bower_components/ + +# RIA/Silverlight projects +Generated_Code/ + +# Backup & report files from converting an old project file +# to a newer Visual Studio version. Backup files are not needed, +# because we have git ;-) +_UpgradeReport_Files/ +Backup*/ +UpgradeLog*.XML +UpgradeLog*.htm +ServiceFabricBackup/ +*.rptproj.bak + +# SQL Server files +*.mdf +*.ldf +*.ndf + +# Business Intelligence projects +*.rdl.data +*.bim.layout +*.bim_*.settings +*.rptproj.rsuser +*- [Bb]ackup.rdl +*- [Bb]ackup ([0-9]).rdl +*- [Bb]ackup ([0-9][0-9]).rdl + +# Microsoft Fakes +FakesAssemblies/ + +# GhostDoc plugin setting file +*.GhostDoc.xml + +# Node.js Tools for Visual Studio +.ntvs_analysis.dat +node_modules/ + +# Visual Studio 6 build log +*.plg + +# Visual Studio 6 workspace options file +*.opt + +# Visual Studio 6 auto-generated workspace file (contains which files were open etc.) +*.vbw + +# Visual Studio LightSwitch build output +**/*.HTMLClient/GeneratedArtifacts +**/*.DesktopClient/GeneratedArtifacts +**/*.DesktopClient/ModelManifest.xml +**/*.Server/GeneratedArtifacts +**/*.Server/ModelManifest.xml +_Pvt_Extensions + +# Paket dependency manager +.paket/paket.exe +paket-files/ + +# FAKE - F# Make +.fake/ + +# CodeRush personal settings +.cr/personal + +# Python Tools for Visual Studio (PTVS) +__pycache__/ +*.pyc + +# Cake - Uncomment if you are using it +# tools/** +# !tools/packages.config + +# Tabs Studio +*.tss + +# Telerik's JustMock configuration file +*.jmconfig + +# BizTalk build output +*.btp.cs +*.btm.cs +*.odx.cs +*.xsd.cs + +# OpenCover UI analysis results +OpenCover/ + +# Azure Stream Analytics local run output +ASALocalRun/ + +# MSBuild Binary and Structured Log +*.binlog + +# NVidia Nsight GPU debugger configuration file +*.nvuser + +# MFractors (Xamarin productivity tool) working folder +.mfractor/ + +# Local History for Visual Studio +.localhistory/ + +# BeatPulse healthcheck temp database +healthchecksdb + +# Backup folder for Package Reference Convert tool in Visual Studio 2017 +MigrationBackup/ + +# Ionide (cross platform F# VS Code tools) working folder +.ionide/ + +# Specflow feature.cs files +*.feature.cs diff --git a/SpecFlow.DependencyInjection.Tests/ContextInjectionScope.feature.cs b/SpecFlow.DependencyInjection.Tests/ContextInjectionScope.feature.cs deleted file mode 100644 index e25dcab..0000000 --- a/SpecFlow.DependencyInjection.Tests/ContextInjectionScope.feature.cs +++ /dev/null @@ -1,140 +0,0 @@ -// ------------------------------------------------------------------------------ -// -// This code was generated by SpecFlow (http://www.specflow.org/). -// SpecFlow Version:3.0.0.0 -// SpecFlow Generator Version:3.0.0.0 -// -// Changes to this file may cause incorrect behavior and will be lost if -// the code is regenerated. -// -// ------------------------------------------------------------------------------ -#region Designer generated code -#pragma warning disable -namespace SolidToken.SpecFlow.DependencyInjection.Tests -{ - using TechTalk.SpecFlow; - - - [System.CodeDom.Compiler.GeneratedCodeAttribute("TechTalk.SpecFlow", "3.0.0.0")] - [System.Runtime.CompilerServices.CompilerGeneratedAttribute()] - public partial class ContextInjectionScopeFeature : Xunit.IClassFixture, System.IDisposable - { - - private static TechTalk.SpecFlow.ITestRunner testRunner; - - private Xunit.Abstractions.ITestOutputHelper _testOutputHelper; - -#line 1 "ContextInjectionScope.feature" -#line hidden - - public ContextInjectionScopeFeature(ContextInjectionScopeFeature.FixtureData fixtureData, Xunit.Abstractions.ITestOutputHelper testOutputHelper) - { - this._testOutputHelper = testOutputHelper; - this.TestInitialize(); - } - - public static void FeatureSetup() - { - testRunner = TechTalk.SpecFlow.TestRunnerManager.GetTestRunner(); - TechTalk.SpecFlow.FeatureInfo featureInfo = new TechTalk.SpecFlow.FeatureInfo(new System.Globalization.CultureInfo("en-US"), "ContextInjectionScope", " Issue #12: Scoping Context Injection to Scenario Execution Lifetimes\r\n htt" + - "ps://github.com/solidtoken/SpecFlow.DependencyInjection/issues/12", ProgrammingLanguage.CSharp, ((string[])(null))); - testRunner.OnFeatureStart(featureInfo); - } - - public static void FeatureTearDown() - { - testRunner.OnFeatureEnd(); - testRunner = null; - } - - public virtual void TestInitialize() - { - } - - public virtual void ScenarioTearDown() - { - testRunner.OnScenarioEnd(); - } - - public virtual void ScenarioInitialize(TechTalk.SpecFlow.ScenarioInfo scenarioInfo) - { - testRunner.OnScenarioInitialize(scenarioInfo); - testRunner.ScenarioContext.ScenarioContainer.RegisterInstanceAs(_testOutputHelper); - } - - public virtual void ScenarioStart() - { - testRunner.OnScenarioStart(); - } - - public virtual void ScenarioCleanup() - { - testRunner.CollectScenarioErrors(); - } - - void System.IDisposable.Dispose() - { - this.ScenarioTearDown(); - } - - [Xunit.FactAttribute(DisplayName="Assert Context Is Scoped To Scenario Execution")] - [Xunit.TraitAttribute("FeatureTitle", "ContextInjectionScope")] - [Xunit.TraitAttribute("Description", "Assert Context Is Scoped To Scenario Execution")] - public virtual void AssertContextIsScopedToScenarioExecution() - { - TechTalk.SpecFlow.ScenarioInfo scenarioInfo = new TechTalk.SpecFlow.ScenarioInfo("Assert Context Is Scoped To Scenario Execution", " The multiply and increase steps are intentionally implemented using different" + - " bindings.\r\n Assert that they can operate on the same context (within the sce" + - "nario executing).", ((string[])(null))); -#line 5 -this.ScenarioInitialize(scenarioInfo); - this.ScenarioStart(); -#line 8 - testRunner.Given("I have test context with number 5", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "Given "); -#line 9 - testRunner.When("I multiply the test context number by 2", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "When "); -#line 10 - testRunner.And("I increase the test context number by 3", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "And "); -#line 11 - testRunner.Then("the test context number should be 13", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "Then "); -#line hidden - this.ScenarioCleanup(); - } - - [Xunit.FactAttribute(DisplayName="Assert Context Is Scoped To Scenario Execution (No Spill)")] - [Xunit.TraitAttribute("FeatureTitle", "ContextInjectionScope")] - [Xunit.TraitAttribute("Description", "Assert Context Is Scoped To Scenario Execution (No Spill)")] - public virtual void AssertContextIsScopedToScenarioExecutionNoSpill() - { - TechTalk.SpecFlow.ScenarioInfo scenarioInfo = new TechTalk.SpecFlow.ScenarioInfo("Assert Context Is Scoped To Scenario Execution (No Spill)", " Assert that the test context does not spill over to other scenarios.\r\n Not" + - "e that this assumes this scenario will be run after the above one (ie don\'t use " + - "parallel tests).", ((string[])(null))); -#line 13 -this.ScenarioInitialize(scenarioInfo); - this.ScenarioStart(); -#line 16 - testRunner.Given("I have a test context", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "Given "); -#line 17 - testRunner.Then("the test context number should be 0", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "Then "); -#line hidden - this.ScenarioCleanup(); - } - - [System.CodeDom.Compiler.GeneratedCodeAttribute("TechTalk.SpecFlow", "3.0.0.0")] - [System.Runtime.CompilerServices.CompilerGeneratedAttribute()] - public class FixtureData : System.IDisposable - { - - public FixtureData() - { - ContextInjectionScopeFeature.FeatureSetup(); - } - - void System.IDisposable.Dispose() - { - ContextInjectionScopeFeature.FeatureTearDown(); - } - } - } -} -#pragma warning restore -#endregion diff --git a/SpecFlow.DependencyInjection.Tests/DependencyInjectionPlugin.feature.cs b/SpecFlow.DependencyInjection.Tests/DependencyInjectionPlugin.feature.cs deleted file mode 100644 index 9c296cb..0000000 --- a/SpecFlow.DependencyInjection.Tests/DependencyInjectionPlugin.feature.cs +++ /dev/null @@ -1,113 +0,0 @@ -// ------------------------------------------------------------------------------ -// -// This code was generated by SpecFlow (http://www.specflow.org/). -// SpecFlow Version:3.0.0.0 -// SpecFlow Generator Version:3.0.0.0 -// -// Changes to this file may cause incorrect behavior and will be lost if -// the code is regenerated. -// -// ------------------------------------------------------------------------------ -#region Designer generated code -#pragma warning disable -namespace SolidToken.SpecFlow.DependencyInjection.Tests -{ - using TechTalk.SpecFlow; - - - [System.CodeDom.Compiler.GeneratedCodeAttribute("TechTalk.SpecFlow", "3.0.0.0")] - [System.Runtime.CompilerServices.CompilerGeneratedAttribute()] - public partial class DependencyInjectionPluginFeature : Xunit.IClassFixture, System.IDisposable - { - - private static TechTalk.SpecFlow.ITestRunner testRunner; - - private Xunit.Abstractions.ITestOutputHelper _testOutputHelper; - -#line 1 "DependencyInjectionPlugin.feature" -#line hidden - - public DependencyInjectionPluginFeature(DependencyInjectionPluginFeature.FixtureData fixtureData, Xunit.Abstractions.ITestOutputHelper testOutputHelper) - { - this._testOutputHelper = testOutputHelper; - this.TestInitialize(); - } - - public static void FeatureSetup() - { - testRunner = TechTalk.SpecFlow.TestRunnerManager.GetTestRunner(); - TechTalk.SpecFlow.FeatureInfo featureInfo = new TechTalk.SpecFlow.FeatureInfo(new System.Globalization.CultureInfo("en-US"), "DependencyInjectionPlugin", "\tAs a developer I want to verify\r\n\tthat the DependencyInjectionPlugin\r\n\tallows me" + - " to use Microsoft.Extensions.DependencyInjection", ProgrammingLanguage.CSharp, ((string[])(null))); - testRunner.OnFeatureStart(featureInfo); - } - - public static void FeatureTearDown() - { - testRunner.OnFeatureEnd(); - testRunner = null; - } - - public virtual void TestInitialize() - { - } - - public virtual void ScenarioTearDown() - { - testRunner.OnScenarioEnd(); - } - - public virtual void ScenarioInitialize(TechTalk.SpecFlow.ScenarioInfo scenarioInfo) - { - testRunner.OnScenarioInitialize(scenarioInfo); - testRunner.ScenarioContext.ScenarioContainer.RegisterInstanceAs(_testOutputHelper); - } - - public virtual void ScenarioStart() - { - testRunner.OnScenarioStart(); - } - - public virtual void ScenarioCleanup() - { - testRunner.CollectScenarioErrors(); - } - - void System.IDisposable.Dispose() - { - this.ScenarioTearDown(); - } - - [Xunit.FactAttribute(DisplayName="Test service injection")] - [Xunit.TraitAttribute("FeatureTitle", "DependencyInjectionPlugin")] - [Xunit.TraitAttribute("Description", "Test service injection")] - public virtual void TestServiceInjection() - { - TechTalk.SpecFlow.ScenarioInfo scenarioInfo = new TechTalk.SpecFlow.ScenarioInfo("Test service injection", null, ((string[])(null))); -#line 6 -this.ScenarioInitialize(scenarioInfo); - this.ScenarioStart(); -#line 7 - testRunner.Then("verify that TestService is correctly injected", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "Then "); -#line hidden - this.ScenarioCleanup(); - } - - [System.CodeDom.Compiler.GeneratedCodeAttribute("TechTalk.SpecFlow", "3.0.0.0")] - [System.Runtime.CompilerServices.CompilerGeneratedAttribute()] - public class FixtureData : System.IDisposable - { - - public FixtureData() - { - DependencyInjectionPluginFeature.FeatureSetup(); - } - - void System.IDisposable.Dispose() - { - DependencyInjectionPluginFeature.FeatureTearDown(); - } - } - } -} -#pragma warning restore -#endregion diff --git a/SpecFlow.DependencyInjection.Tests/SpecFlow.DependencyInjection.Tests.csproj b/SpecFlow.DependencyInjection.Tests/SpecFlow.DependencyInjection.Tests.csproj index a94aa90..a407594 100644 --- a/SpecFlow.DependencyInjection.Tests/SpecFlow.DependencyInjection.Tests.csproj +++ b/SpecFlow.DependencyInjection.Tests/SpecFlow.DependencyInjection.Tests.csproj @@ -8,19 +8,17 @@ - + all runtime; build; native; contentfiles; analyzers - - - + + all runtime; build; native; contentfiles; analyzers - - - + + all @@ -32,33 +30,4 @@ - - - True - True - ContextInjectionScope.feature - - - True - True - DependencyInjectionPlugin.feature - - - - - - SpecFlowSingleFileGenerator - - - - - - SpecFlowSingleFileGenerator - ContextInjectionScope.feature.cs - - - SpecFlowSingleFileGenerator - - - diff --git a/SpecFlow.DependencyInjection/SpecFlow.DependencyInjection.csproj b/SpecFlow.DependencyInjection/SpecFlow.DependencyInjection.csproj index 2a4d691..092a23a 100644 --- a/SpecFlow.DependencyInjection/SpecFlow.DependencyInjection.csproj +++ b/SpecFlow.DependencyInjection/SpecFlow.DependencyInjection.csproj @@ -22,12 +22,12 @@ - + all runtime; build; native; contentfiles; analyzers - - - + + +